2 Commits

Author	SHA1	Message	Date
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
Mans Rullgard	88386feefd	cavs: convert cavsdata.h to a .c file ... Defining tables in header files is ugly and prone to duplication. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2012-08-26 14:03:56 +02:00