generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/remove_extradata_bsf: Add back 'k' and 'e' options

Browse Source 
broken since af9cac1be1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-04-18 02:31:55 +02:00
parent 8106479503
commit 57fc93ecb2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/remove_extradata_bsf.c
View File

@ -27,6 +27,7 @@
enum RemoveFreq { enum RemoveFreq {
REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_KEYFRAME,
REMOVE_FREQ_ALL, REMOVE_FREQ_ALL,
REMOVE_FREQ_NONKEYFRAME,
}; };
typedef struct RemoveExtradataContext { typedef struct RemoveExtradataContext {
@ -50,6 +51,7 @@ static int remove_extradata(AVBSFContext *ctx, AVPacket *out)
if (s->parser && s->parser->parser->split) { if (s->parser && s->parser->parser->split) {
if (s->freq == REMOVE_FREQ_ALL || if (s->freq == REMOVE_FREQ_ALL ||
(s->freq == REMOVE_FREQ_NONKEYFRAME && !(in->flags & AV_PKT_FLAG_KEY)) ||
(s->freq == REMOVE_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) { (s->freq == REMOVE_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) {
int i = s->parser->parser->split(s->avctx, in->data, in->size); int i = s->parser->parser->split(s->avctx, in->data, in->size);
in->data += i; in->data += i;
@ -94,7 +96,9 @@ static void remove_extradata_close(AVBSFContext *ctx)
#define OFFSET(x) offsetof(RemoveExtradataContext, x) #define OFFSET(x) offsetof(RemoveExtradataContext, x)
static const AVOption options[] = { static const AVOption options[] = {
{ "freq", NULL, OFFSET(freq), AV_OPT_TYPE_INT, { .i64 = REMOVE_FREQ_KEYFRAME }, REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_ALL, 0, "freq" }, { "freq", NULL, OFFSET(freq), AV_OPT_TYPE_INT, { .i64 = REMOVE_FREQ_KEYFRAME }, REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_ALL, 0, "freq" },
{ "k", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_NONKEYFRAME }, .unit = "freq" },
{ "keyframe", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_KEYFRAME }, .unit = "freq" }, { "keyframe", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_KEYFRAME }, .unit = "freq" },
{ "e", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_ALL }, .unit = "freq" },
{ "all", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_ALL }, .unit = "freq" }, { "all", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_ALL }, .unit = "freq" },
{ NULL }, { NULL },
}; };