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
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-12-06 01:37:27 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2011-12-04 01:02:37 +01:00
lavf	movenc: Write file with minimal number of chunks for the given interleaving.	2011-11-29 04:51:47 +01:00
lavfi	vf_scale: support PAL8 output by producing BGR8.	2011-12-05 20:05:44 +01:00
seek	fate: update asf seektest	2011-12-02 16:43:05 +01:00
vsynth1	Add tests for several encoders.	2011-12-05 20:05:44 +01:00
vsynth2	Add tests for several encoders.	2011-12-05 20:05:44 +01:00