Michael Niedermayer b404ab9e74 Merge remote-tracking branch 'qatar/master' ... * qatar/master: mov: Don't av_malloc(0). avconv: only allocate 1 AVFrame per input stream avconv: fix memleaks due to not freeing the AVFrame for audio h264-fate: remove -strict 1 except where necessary (mr4/5-tandberg). misc Doxygen markup improvements doxygen: eliminate Qt-style doxygen syntax g722: Add a regression test for muxing/demuxing in wav g722: Change bits per sample to 4 g722dec: Signal skipping the lower bits via AVOptions instead of bits_per_coded_sample api-example: update to use avcodec_decode_audio4() avplay: use avcodec_decode_audio4() avplay: use a separate buffer for playing silence avformat: use avcodec_decode_audio4() in avformat_find_stream_info() avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3() mov: Allow empty stts atom. doc: document preferred Doxygen syntax and make patcheck detect it Conflicts: avconv.c ffplay.c libavcodec/mlpdec.c libavcodec/version.h libavformat/mov.c tests/codec-regression.sh tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-12-06 01:37:27 +01:00
..
aac.mak	latmdec: add fate test for audio config change	2011-12-04 15:38:14 +01:00
als.mak
amrnb.mak
amrwb.mak
dct.mak
fft.mak
h264.mak	Merge remote-tracking branch 'qatar/master'	2011-12-06 01:37:27 +01:00
libavutil.mak
mp3.mak
prores.mak	Merge remote-tracking branch 'qatar/master'	2011-10-14 22:24:00 +02:00
vorbis.mak
vp8.mak	md5enc: add flags	2011-11-23 20:19:26 +01:00