diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:07:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-13 01:29:48 +0100 |
| commit | b18e17eabf3ba51da2d0fd0f85c4815945bfd70a (patch) | |
| tree | e949920e01cba93fbedca647076f72b31eec59cb /libavfilter/vsrc_buffer.c | |
| parent | a2c419848df3e76e164bd19c3841f39d2971d326 (diff) | |
| parent | 4df30f71147b7bedd4457bcfa0e4efe01085af9f (diff) | |
| download | ffmpeg-b18e17eabf3ba51da2d0fd0f85c4815945bfd70a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
utils: Check for extradata size overflows.
ARM: rv34: fix asm syntax in dc transform functions
avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
rv34: fix and optimise frame dependency checking
rv34: NEON optimised dc only inverse transform
avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
ffmenc: remove references to deprecated AVFormatContext.timestamp.
lavf: undeprecate read_seek().
avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
lavc: ifdef out parse_only AVOption
nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
riff: remove references to sonic codec ids
indeo4: add some missing static and const qualifiers
rv34: DC-only inverse transform
avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
lavfi: move version macros to a new installed header version.h
vsrc_buffer: release the buffer on uninit.
rgb2rgb: rgb12tobgr12()
...
Conflicts:
avconv.c
doc/APIchanges
ffprobe.c
libavfilter/Makefile
libavfilter/avfilter.h
libswscale/rgb2rgb.c
libswscale/rgb2rgb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_buffer.c')
| -rw-r--r-- | libavfilter/vsrc_buffer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 362449342e..743698eff9 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -182,6 +182,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) return 0; } +static av_cold void uninit(AVFilterContext *ctx) +{ + BufferSourceContext *s = ctx->priv; + if (s->picref) + avfilter_unref_buffer(s->picref); + s->picref = NULL; +} + static int query_formats(AVFilterContext *ctx) { BufferSourceContext *c = ctx->priv; @@ -235,6 +243,7 @@ AVFilter avfilter_vsrc_buffer = { .query_formats = query_formats, .init = init, + .uninit = uninit, .inputs = (const AVFilterPad[]) {{ .name = NULL }}, .outputs = (const AVFilterPad[]) {{ .name = "default", |