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>

1 files changed, 0 insertions, 52 deletions

diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h
index 53e1aaab06..6df32f39f2 100644
--- a/libavcodec/dwt.h
+++ b/libavcodec/dwt.h
@@ -154,7 +154,6 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
 #define DWT_53 1
 
 #define liftS lift
-#if 1
 #define W_AM 3
 #define W_AO 0
 #define W_AS 1
@@ -171,57 +170,6 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
 #define W_DM 3
 #define W_DO 4
 #define W_DS 3
-#elif 0
-#define W_AM 55
-#define W_AO 16
-#define W_AS 5
-
-#define W_BM 3
-#define W_BO 32
-#define W_BS 6
-
-#define W_CM 127
-#define W_CO 64
-#define W_CS 7
-
-#define W_DM 7
-#define W_DO 8
-#define W_DS 4
-#elif 0
-#define W_AM 97
-#define W_AO 32
-#define W_AS 6
-
-#define W_BM 63
-#define W_BO 512
-#define W_BS 10
-
-#define W_CM 13
-#define W_CO 8
-#define W_CS 4
-
-#define W_DM 15
-#define W_DO 16
-#define W_DS 5
-
-#else
-
-#define W_AM 203
-#define W_AO 64
-#define W_AS 7
-
-#define W_BM 217
-#define W_BO 2048
-#define W_BS 12
-
-#define W_CM 113
-#define W_CO 64
-#define W_CS 7
-
-#define W_DM 227
-#define W_DO 128
-#define W_DS 9
-#endif
 
 #define slice_buffer_get_line(slice_buf, line_num)                          \
     ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num]              \