January 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/af_afir: split off fcmul_add into a DSP context
by James Almer 03 Jan '19

03 Jan '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Jan 2 20:54:18 2019 -0300| [82043dfd2e50dd02d40ac7cb023f09090318e479] | committer: James Almer avfilter/af_afir: split off fcmul_add into a DSP context Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82043dfd2e50dd02d… --- libavfilter/af_afir.c | 15 ++++++++++----- libavfilter/af_afir.h | 12 +++++++++--- libavfilter/x86/af_afir_init.c | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index c4baf63c02..c755dc1f6f 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -103,7 +103,7 @@ static int fir_quantum(AVFilterContext *ctx, AVFrame *out, int ch, int offset) const float *block = (const float *)seg->block->extended_data[ch] + i * seg->block_size; const FFTComplex *coeff = (const FFTComplex *)seg->coeff->extended_data[ch * !s->one2many] + coffset; - s->fcmul_add(sum, block, (const float *)coeff, seg->part_size); + s->afirdsp.fcmul_add(sum, block, (const float *)coeff, seg->part_size); if (j == 0) j = seg->nb_partitions; @@ -753,6 +753,14 @@ static int config_video(AVFilterLink *outlink) return 0; } +void ff_afir_init(AudioFIRDSPContext *dsp) +{ + dsp->fcmul_add = fcmul_add_c; + + if (ARCH_X86) + ff_afir_init_x86(dsp); +} + static av_cold int init(AVFilterContext *ctx) { AudioFIRContext *s = ctx->priv; @@ -792,14 +800,11 @@ static av_cold int init(AVFilterContext *ctx) } } - s->fcmul_add = fcmul_add_c; - s->fdsp = avpriv_float_dsp_alloc(0); if (!s->fdsp) return AVERROR(ENOMEM); - if (ARCH_X86) - ff_afir_init_x86(s); + ff_afir_init(&s->afirdsp); return 0; } diff --git a/libavfilter/af_afir.h b/libavfilter/af_afir.h index f9bec54b8c..f665c0ef80 100644 --- a/libavfilter/af_afir.h +++ b/libavfilter/af_afir.h @@ -53,6 +53,11 @@ typedef struct AudioFIRSegment { RDFTContext **rdft, **irdft; } AudioFIRSegment; +typedef struct AudioFIRDSPContext { + void (*fcmul_add)(float *sum, const float *t, const float *c, + ptrdiff_t len); +} AudioFIRDSPContext; + typedef struct AudioFIRContext { const AVClass *class; @@ -87,11 +92,12 @@ typedef struct AudioFIRContext { int min_part_size; int64_t pts; + AudioFIRDSPContext afirdsp; AVFloatDSPContext *fdsp; - void (*fcmul_add)(float *sum, const float *t, const float *c, - ptrdiff_t len); + } AudioFIRContext; -void ff_afir_init_x86(AudioFIRContext *s); +void ff_afir_init(AudioFIRDSPContext *s); +void ff_afir_init_x86(AudioFIRDSPContext *s); #endif /* AVFILTER_AFIR_H */ diff --git a/libavfilter/x86/af_afir_init.c b/libavfilter/x86/af_afir_init.c index 6a652b9b83..29e6f976b2 100644 --- a/libavfilter/x86/af_afir_init.c +++ b/libavfilter/x86/af_afir_init.c @@ -25,7 +25,7 @@ void ff_fcmul_add_sse3(float *sum, const float *t, const float *c, ptrdiff_t len); -av_cold void ff_afir_init_x86(AudioFIRContext *s) +av_cold void ff_afir_init_x86(AudioFIRDSPContext *s) { int cpu_flags = av_get_cpu_flags();

1 0

x86/af_afir: fix processing the last element
by James Almer 03 Jan '19

03 Jan '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Jan 2 20:48:59 2019 -0300| [9b5bd665e105894919cdcfa0ed9818919538e5f6] | committer: James Almer x86/af_afir: fix processing the last element ff_fcmul_add_sse3() is now identical to the C version. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b5bd665e10589491… --- libavfilter/x86/af_afir.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/x86/af_afir.asm b/libavfilter/x86/af_afir.asm index 849d85e70f..fcc1f426db 100644 --- a/libavfilter/x86/af_afir.asm +++ b/libavfilter/x86/af_afir.asm @@ -30,7 +30,6 @@ SECTION .text INIT_XMM sse3 cglobal fcmul_add, 4,4,6, sum, t, c, len shl lend, 3 - add lend, mmsize*2 add tq, lenq add cq, lenq add sumq, lenq @@ -57,4 +56,8 @@ ALIGN 16 movaps [sumq + lenq+mmsize], m3 add lenq, mmsize*2 jl .loop - REP_RET + movss xm0, [tq + lenq] + mulss xm0, [cq + lenq] + addss xm0, [sumq + lenq] + movss [sumq + lenq], xm0 + RET

1 0

ffmpeg: allow disabling streams by type for inputs
by Gyan Doshi 03 Jan '19

03 Jan '19

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Sat Dec 29 16:37:09 2018 +0530| [3ba5eef2c7b21a1af48d8d9ccb58f2ed4ebc874a] | committer: Gyan Doshi ffmpeg: allow disabling streams by type for inputs -vn/-an/-sn/-dn now works for input. Streams are still registered in input_streams but they can't be automatically selected or mapped or filtered. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ba5eef2c7b21a1af… --- fftools/ffmpeg_opt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 050a65c2c1..a99e762dc6 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -760,6 +760,13 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) MATCH_PER_STREAM_OPT(discard, str, discard_str, ic, st); ist->user_set_discard = AVDISCARD_NONE; + + if ((o->video_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) || + (o->audio_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) || + (o->subtitle_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) || + (o->data_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_DATA)) + ist->user_set_discard = AVDISCARD_ALL; + if (discard_str && av_opt_eval_int(&cc, discard_opt, discard_str, &ist->user_set_discard) < 0) { av_log(NULL, AV_LOG_ERROR, "Error parsing discard %s.\n", discard_str);

1 0

ffmpeg: skip disabled streams
by Gyan Doshi 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Gyan Doshi <ffmpeg(a)gyani.pro> | Sat Dec 29 16:35:05 2018 +0530| [54109b1d1472bc49cec5e236508dffc96aa4f0a1] | committer: Michael Niedermayer ffmpeg: skip disabled streams Fully discarded streams can't be selected for output or mapped or filtered. Previously, a few packets from such streams, probably buffered for stream probing, would get smuggled into output files. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54109b1d1472bc49c… --- fftools/ffmpeg_filter.c | 7 +++++++ fftools/ffmpeg_opt.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 6518d50870..8c0ff99dd9 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -293,10 +293,17 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) exit_program(1); } ist = input_streams[input_files[file_idx]->ist_index + st->index]; + if (ist->user_set_discard == AVDISCARD_ALL) { + av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " + "matches a disabled input stream.\n", p, fg->graph_desc); + exit_program(1); + } } else { /* find the first unused stream of corresponding type */ for (i = 0; i < nb_input_streams; i++) { ist = input_streams[i]; + if (ist->user_set_discard == AVDISCARD_ALL) + continue; if (ist->dec_ctx->codec_type == type && ist->discard) break; } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index d4851a2cd8..050a65c2c1 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -268,7 +268,7 @@ static int opt_map(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; StreamMap *m = NULL; - int i, negative = 0, file_idx; + int i, negative = 0, file_idx, disabled = 0; int sync_file_idx = -1, sync_stream_idx = 0; char *p, *sync; char *map; @@ -303,6 +303,11 @@ static int opt_map(void *optctx, const char *opt, const char *arg) "match any streams.\n", arg); exit_program(1); } + if (input_streams[input_files[sync_file_idx]->ist_index + sync_stream_idx]->user_set_discard == AVDISCARD_ALL) { + av_log(NULL, AV_LOG_FATAL, "Sync stream specification in map %s matches a disabled input " + "stream.\n", arg); + exit_program(1); + } } @@ -339,6 +344,10 @@ static int opt_map(void *optctx, const char *opt, const char *arg) if (check_stream_specifier(input_files[file_idx]->ctx, input_files[file_idx]->ctx->streams[i], *p == ':' ? p + 1 : p) <= 0) continue; + if (input_streams[input_files[file_idx]->ist_index + i]->user_set_discard == AVDISCARD_ALL) { + disabled = 1; + continue; + } GROW_ARRAY(o->stream_maps, o->nb_stream_maps); m = &o->stream_maps[o->nb_stream_maps - 1]; @@ -358,6 +367,10 @@ static int opt_map(void *optctx, const char *opt, const char *arg) if (!m) { if (allow_unused) { av_log(NULL, AV_LOG_VERBOSE, "Stream map '%s' matches no streams; ignoring.\n", arg); + } else if (disabled) { + av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches disabled streams.\n" + "To ignore this, add a trailing '?' to the map.\n", arg); + exit_program(1); } else { av_log(NULL, AV_LOG_FATAL, "Stream map '%s' matches no streams.\n" "To ignore this, add a trailing '?' to the map.\n", arg); @@ -437,7 +450,8 @@ static int opt_map_channel(void *optctx, const char *opt, const char *arg) /* allow trailing ? to map_channel */ if (allow_unused = strchr(mapchan, '?')) *allow_unused = 0; - if (m->channel_idx < 0 || m->channel_idx >= st->codecpar->channels) { + if (m->channel_idx < 0 || m->channel_idx >= st->codecpar->channels || + input_streams[input_files[m->file_idx]->ist_index + m->stream_idx]->user_set_discard == AVDISCARD_ALL) { if (allow_unused) { av_log(NULL, AV_LOG_VERBOSE, "mapchan: invalid audio channel #%d.%d.%d\n", m->file_idx, m->stream_idx, m->channel_idx); @@ -2174,6 +2188,8 @@ static int open_output_file(OptionsContext *o, const char *filename) int new_area; ist = input_streams[i]; new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames; + if (ist->user_set_discard == AVDISCARD_ALL) + continue; if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)) new_area = 1; if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && @@ -2195,6 +2211,8 @@ static int open_output_file(OptionsContext *o, const char *filename) int score; ist = input_streams[i]; score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames; + if (ist->user_set_discard == AVDISCARD_ALL) + continue; if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && score > best_score) { best_score = score; @@ -2216,6 +2234,8 @@ static int open_output_file(OptionsContext *o, const char *filename) AVCodec const *output_codec = avcodec_find_encoder(oc->oformat->subtitle_codec); int input_props = 0, output_props = 0; + if (input_streams[i]->user_set_discard == AVDISCARD_ALL) + continue; if (output_codec) output_descriptor = avcodec_descriptor_get(output_codec->id); if (input_descriptor) @@ -2237,6 +2257,8 @@ static int open_output_file(OptionsContext *o, const char *filename) if (!o->data_disable ) { enum AVCodecID codec_id = av_guess_codec(oc->oformat, NULL, filename, NULL, AVMEDIA_TYPE_DATA); for (i = 0; codec_id != AV_CODEC_ID_NONE && i < nb_input_streams; i++) { + if (input_streams[i]->user_set_discard == AVDISCARD_ALL) + continue; if (input_streams[i]->st->codecpar->codec_type == AVMEDIA_TYPE_DATA && input_streams[i]->st->codecpar->codec_id == codec_id ) new_data_stream(o, oc, i); @@ -2275,6 +2297,11 @@ loop_end: int src_idx = input_files[map->file_index]->ist_index + map->stream_index; ist = input_streams[input_files[map->file_index]->ist_index + map->stream_index]; + if (ist->user_set_discard == AVDISCARD_ALL) { + av_log(NULL, AV_LOG_FATAL, "Stream #%d:%d is disabled and cannot be mapped.\n", + map->file_index, map->stream_index); + exit_program(1); + } if(o->subtitle_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) continue; if(o-> audio_disable && ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)

1 0

mov: Remove duration-of-last-frame heuristic hack
by Derek Buitenhuis 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Mon Dec 24 14:47:55 2018 -0500| [8f585c3c550c2dd7b2a3575f3544a3bede28eb9f] | committer: Derek Buitenhuis mov: Remove duration-of-last-frame heuristic hack This breaks totally valid files that get caught in its heuristic. This, according to the commit message, is my own doing, having asked Michael to implement this check and providing a sample that was "wrong". I am now atoning for my sins, and removing this hack, having seen the light (aka that this was silly to do in the first place). Resotores correct behavior on valid files. This reverts commit 8e5e84c2a2a21a979b48e80c5a8dd44754ab3f21. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f585c3c550c2dd7b… --- libavformat/mov.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 825738127b..970cd87f70 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2923,12 +2923,6 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "sample_count=%d, sample_duration=%d\n", sample_count, sample_duration); - if ( i+1 == entries - && i - && sample_count == 1 - && total_sample_count > 100 - && sample_duration/10 > duration / total_sample_count) - sample_duration = duration / total_sample_count; duration+=(int64_t)sample_duration*(uint64_t)sample_count; total_sample_count+=sample_count; }

1 0

avformat/anm: use ff_get_extradata()
by Paul B Mahol 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 2 16:28:46 2019 +0100| [37af319086a6d305b96e34404815af64a2f3e26b] | committer: Paul B Mahol avformat/anm: use ff_get_extradata() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37af319086a6d305b… --- libavformat/anm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/anm.c b/libavformat/anm.c index b31757ab0a..a5ad2fd0ef 100644 --- a/libavformat/anm.c +++ b/libavformat/anm.c @@ -132,12 +132,7 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 58); /* color cycling and palette data */ - st->codecpar->extradata_size = 16*8 + 4*256; - st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codecpar->extradata) { - return AVERROR(ENOMEM); - } - ret = avio_read(pb, st->codecpar->extradata, st->codecpar->extradata_size); + ret = ff_get_extradata(s, st->codecpar, s->pb, 16*8 + 4*256); if (ret < 0) return ret;

1 0

avformat/yop: use ff_get_extradata()
by Paul B Mahol 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 2 16:25:26 2019 +0100| [e8d36ba47753ef791e4589efbf3673b8c1dd3233] | committer: Paul B Mahol avformat/yop: use ff_get_extradata() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8d36ba47753ef791… --- libavformat/yop.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/yop.c b/libavformat/yop.c index e6fd896668..b4b5fb4e15 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -68,10 +68,6 @@ static int yop_read_header(AVFormatContext *s) if (!audio_stream || !video_stream) return AVERROR(ENOMEM); - // Extra data that will be passed to the decoder - if (ff_alloc_extradata(video_stream->codecpar, 8)) - return AVERROR(ENOMEM); - // Audio audio_par = audio_stream->codecpar; audio_par->codec_type = AVMEDIA_TYPE_AUDIO; @@ -94,9 +90,9 @@ static int yop_read_header(AVFormatContext *s) video_stream->sample_aspect_ratio = (AVRational){1, 2}; - ret = avio_read(pb, video_par->extradata, 8); - if (ret < 8) - return ret < 0 ? ret : AVERROR_EOF; + ret = ff_get_extradata(s, video_par, pb, 8); + if (ret < 0) + return ret; yop->palette_size = video_par->extradata[0] * 3 + 4; yop->audio_block_length = AV_RL16(video_par->extradata + 6);

1 0

avformat/acm: use ff_get_extradata()
by Paul B Mahol 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 2 16:21:46 2019 +0100| [1139887ace7f15053527cbc8b0a354899bcfcf63] | committer: Paul B Mahol avformat/acm: use ff_get_extradata() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1139887ace7f15053… --- libavformat/acm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/acm.c b/libavformat/acm.c index 08dd9282fa..dcf8778dc7 100644 --- a/libavformat/acm.c +++ b/libavformat/acm.c @@ -44,12 +44,9 @@ static int acm_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_INTERPLAY_ACM; - ff_alloc_extradata(st->codecpar, 14); - if (!st->codecpar->extradata) - return AVERROR(ENOMEM); - ret = avio_read(s->pb, st->codecpar->extradata, 14); - if (ret < 10) - return ret < 0 ? ret : AVERROR_EOF; + ret = ff_get_extradata(s, st->codecpar, s->pb, 14); + if (ret < 0) + return ret; st->codecpar->channels = AV_RL16(st->codecpar->extradata + 8); st->codecpar->sample_rate = AV_RL16(st->codecpar->extradata + 10);

1 0

aformat/bfi: use ff_get_extradata()
by Paul B Mahol 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 2 16:14:19 2019 +0100| [25c7aa9974af21eaae97f85bcc83e1d815ba6f6b] | committer: Paul B Mahol aformat/bfi: use ff_get_extradata() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25c7aa9974af21eaa… --- libavformat/bfi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/bfi.c b/libavformat/bfi.c index 6c98e33ab4..0dad658f95 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -54,7 +54,7 @@ static int bfi_read_header(AVFormatContext * s) AVIOContext *pb = s->pb; AVStream *vstream; AVStream *astream; - int fps, chunk_header; + int ret, fps, chunk_header; /* Initialize the video codec... */ vstream = avformat_new_stream(s, NULL); @@ -80,12 +80,9 @@ static int bfi_read_header(AVFormatContext * s) /*Load the palette to extradata */ avio_skip(pb, 8); - vstream->codecpar->extradata = av_malloc(768); - if (!vstream->codecpar->extradata) - return AVERROR(ENOMEM); - vstream->codecpar->extradata_size = 768; - avio_read(pb, vstream->codecpar->extradata, - vstream->codecpar->extradata_size); + ret = ff_get_extradata(s, vstream->codecpar, pb, 768); + if (ret < 0) + return ret; astream->codecpar->sample_rate = avio_rl32(pb); if (astream->codecpar->sample_rate <= 0) {

1 0

avfilter/vf_detelecine: fix obvious frame memory leaks
by Paul B Mahol 02 Jan '19

02 Jan '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 2 15:34:41 2019 +0100| [af5b6b45b4d8103a6daaa029beb64f7f6e521792] | committer: Paul B Mahol avfilter/vf_detelecine: fix obvious frame memory leaks > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af5b6b45b4d8103a6… --- libavfilter/vf_detelecine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_detelecine.c b/libavfilter/vf_detelecine.c index 0d1e2f2ffb..0199214c3e 100644 --- a/libavfilter/vf_detelecine.c +++ b/libavfilter/vf_detelecine.c @@ -206,6 +206,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) if (s->nskip_fields >= 2) { s->nskip_fields -= 2; + av_frame_free(&inpicref); return 0; } else if (s->nskip_fields >= 1) { for (i = 0; i < s->nb_planes; i++) { @@ -216,6 +217,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) } s->occupied = 1; s->nskip_fields--; + av_frame_free(&inpicref); return 0; }

1 0