ffmpeg/libavfilter/x86
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
..
gradfun.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
hqdn3d.asm Merge remote-tracking branch 'qatar/master' 2012-08-26 22:40:02 +02:00
Makefile vf_hqdn3d: x86 asm 2012-08-26 10:49:14 +00:00
yadif_template.c Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
yadif.c yadif: remove libavutil/internal.h include 2012-08-16 17:27:55 +02:00