Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Aug 2012 20:36:13 +0000 (22:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Aug 2012 20:40:02 +0000 (22:40 +0200)
commit17106a7c90902c7cddc5ad516234bd0e37d27732
tree674b2b4bf6bba67f441c925511fc1cabe5bda74a
parent3a621c9d9929bcad3ae042c4c33308b4544c7cb1
parentd7f9786cbcd3fede7c751f1c1f481e55ee2380bd
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>
13 files changed:
ffmpeg.c
libavcodec/Makefile
libavcodec/audio_frame_queue.h
libavcodec/cavs.c
libavcodec/cavs.h
libavcodec/cavsdata.c
libavcodec/cavsdata.h
libavcodec/cavsdec.c
libavcodec/dwt.c
libavcodec/dwt.h
libavfilter/vf_hqdn3d.c
libavfilter/x86/hqdn3d.asm
libavutil/x86/x86inc.asm