diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 18:04:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 18:04:22 +0200 |
| commit | 776fb2e10d4a4f0bc3fc6b46d1e74e358ec64556 (patch) | |
| tree | a4904a9affc839fca9da375098e2587c813846bc /libavfilter/formats.c | |
| parent | 09a278fdd13cfc16c151190051f362625595c06e (diff) | |
| parent | 0dfcbe5285f04964f5de5e15a4bfbf83fb9fd082 (diff) | |
| download | ffmpeg-776fb2e10d4a4f0bc3fc6b46d1e74e358ec64556.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
lavfi: avfilter_merge_formats: handle case where inputs are same
mpegvideo: Don't use ff_mspel_motion() for vc1
imgconvert: avoid undefined left shift in avcodec_find_best_pix_fmt
nuv: check RTjpeg header for validity
vc1dec: add flush function for WMV9 and VC-1 decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 33fec163a5..c91f8b2cf8 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -43,6 +43,9 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) AVFilterFormats *ret; unsigned i, j, k = 0; + if (a == b) + return a; + ret = av_mallocz(sizeof(AVFilterFormats)); /* merge list of formats */ |