Michael Niedermayer 653d117c29 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>		2012-05-07 22:51:34 +02:00
..
x86	build: cosmetics: Add missing end-of-line backslashes to item lists.	2012-05-07 14:17:40 +02:00
audio_convert.c
audio_convert.h
audio_data.c
audio_data.h
audio_mix_matrix.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
audio_mix.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
audio_mix.h	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
avresample-test.c
avresample.h	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
internal.h
libavresample.v
Makefile	build: cosmetics: Add missing end-of-line backslashes to item lists.	2012-05-07 14:17:40 +02:00
options.c	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00
resample.c
resample.h
utils.c
version.h	lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type	2012-05-01 13:52:59 -04:00