aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/formats.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-07 22:42:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-07 22:51:34 +0200
commit653d117c29123d353ce3bdd7de71e830a26733c1 (patch)
tree996ad2bd13c774dc3265cbf0d8ae406372d57307 /libavfilter/formats.c
parentcb982739fa2b43afb7f1262c07804cad41f778de (diff)
parentfdc918632f5c16cf377a2170cd2f101933fb15ff (diff)
downloadffmpeg-653d117c29123d353ce3bdd7de71e830a26733c1.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
-rw-r--r--libavfilter/formats.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index c52c79dd26..569178fca8 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -47,7 +47,8 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
AVFilterFormats *ret;
unsigned i, j, k = 0;
- if (a == b) return a;
+ if (a == b)
+ return a;
ret = av_mallocz(sizeof(*ret));