Michael Niedermayer 17106a7c90 Merge remote-tracking branch 'qatar/master' ... * qatar/master: audio_frame_queue: Clean up ff_af_queue_log_state debug function dwt: Remove unused code. cavs: convert cavsdata.h to a .c file cavs: Move inline functions only used in one file out of the header cavs: Move data tables used in only one place to that file fate: Add a single symbol Ut Video decoder test vf_hqdn3d: x86 asm vf_hqdn3d: support 16bit colordepth avconv: prefer user-forced input framerate when choosing output framerate Conflicts: ffmpeg.c libavcodec/audio_frame_queue.c libavcodec/dwt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-26 22:40:02 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2012-08-26 22:40:02 +02:00
lavf	nutenc: Support writing an index	2012-08-26 22:15:21 +02:00
lavf-fate	mp3enc: add lame tag with start padding info	2012-07-14 17:20:22 +02:00
lavfi	nutenc: Support writing an index	2012-08-26 22:15:21 +02:00
seek	nutenc: Support writing an index	2012-08-26 22:15:21 +02:00
vsynth1	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00
vsynth2	Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'	2012-05-30 01:40:54 +02:00