Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

23 files changed, 1 insertions, 51 deletions

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index cd22aa4c39..d2c90ac5c0 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -24,6 +24,7 @@
  * 4XM codec.
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/frame.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
@@ -32,7 +33,6 @@
 #include "get_bits.h"
 #include "internal.h"
 
-#include "libavutil/avassert.h"
 
 #define BLOCK_TYPE_VLC_BITS 5
 #define ACDC_VLC_BITS 9
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index ff20965044..a0b810e0d7 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -26,8 +26,6 @@
  * The simplest AC-3 encoder.
  */
 
-//#define ASSERT_LEVEL 2
-
 #include <stdint.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 96d467c7c2..e7aeb0c7f0 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -25,10 +25,6 @@
  * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
  */
 
-
-//#define DEBUG
-
-
 #include "avcodec.h"
 #include "get_bits.h"
 #include "unary.h"
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 11bed00e02..e96369be9a 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -22,9 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define TRACE
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 42b47506d9..3b11183e0f 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -23,7 +23,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
 #define RC_VARIANCE 1 // use variance or ssd for fast rc
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 07a95aff30..4381caa6b4 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -34,9 +34,6 @@
 #include "avcodec.h"
 #include "rnd_avg.h"
 
-
-//#define DEBUG
-
 /* encoding scans */
 extern const uint8_t ff_alternate_horizontal_scan[64];
 extern const uint8_t ff_alternate_vertical_scan[64];
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 4e9c6c43a5..38af768639 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -27,8 +27,6 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/avstring.h"
 
-//#define DEBUG
-
 typedef struct DVDSubContext
 {
   AVClass *class;
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index 5ca82e3255..4c1cb83aa5 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index e60e58e6b0..eda61f6c7b 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -27,7 +27,6 @@
  * h263/mpeg4 codec.
  */
 
-//#define DEBUG
 #include <limits.h>
 
 #include "avcodec.h"
@@ -39,8 +38,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#undef NDEBUG
-//#include <assert.h>
 
 uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 7d28872955..bf9e072546 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -41,8 +41,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#define DEBUG
-
 av_cold int ff_h263_decode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index c104caed41..6d06a099e9 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -28,8 +28,6 @@
  */
 
 #define UNCHECKED_BITSTREAM_READER 1
-
-//#define DEBUG
 #include <limits.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index a17f63adbf..2db9581119 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -27,7 +27,6 @@
  * h263 bitstream encoder.
  */
 
-//#define DEBUG
 #include <limits.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 5369c051c2..f4d8abecc9 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -27,7 +27,6 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-//#define DEBUG
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/timecode.h"
@@ -45,7 +44,6 @@
 #include "xvmc_internal.h"
 #include "thread.h"
 
-
 uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
 #define INIT_2D_VLC_RL(rl, static_size)\
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 78c46fe2d6..b5ef9663a3 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -25,7 +25,6 @@
  * MPEG-1/2 decoder
  */
 
-//#define DEBUG
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "internal.h"
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c
index 7841b30e30..1772c2a3c4 100644
--- a/libavcodec/mpegaudiodecheader.c
+++ b/libavcodec/mpegaudiodecheader.c
@@ -24,7 +24,6 @@
  * MPEG Audio header decoder.
  */
 
-//#define DEBUG
 #include "avcodec.h"
 #include "mpegaudio.h"
 #include "mpegaudiodata.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index c4455ac52d..d61d684209 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -42,9 +42,6 @@
 #include "thread.h"
 #include <limits.h>
 
-//#undef NDEBUG
-//#include <assert.h>
-
 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
                                    int16_t *block, int n, int qscale);
 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
@@ -60,9 +57,6 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
 static void dct_unquantize_h263_inter_c(MpegEncContext *s,
                                   int16_t *block, int n, int qscale);
 
-//#define DEBUG
-
-
 static const uint8_t ff_default_chroma_qscale_table[32] = {
 //   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 5858865c1c..0db2f83d6b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -52,17 +52,12 @@
 #include <limits.h>
 #include "sp5x.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 static int encode_picture(MpegEncContext *s, int picture_number);
 static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
 static int sse_mb(MpegEncContext *s);
 static void denoise_dct_c(MpegEncContext *s, int16_t *block);
 static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow);
 
-//#define DEBUG
-
 static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
 static uint8_t default_fcode_tab[MAX_MV * 2 + 1];
 
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 766415efe1..a054520e79 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -45,7 +45,6 @@
  *        - (encoding) select best mv table (two choices)
  *        - (encoding) select best vlc/dc table
  */
-//#define DEBUG
 
 /* This table is practically identical to the one from h263
  * except that it is inverted. */
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 086f3b414e..8b33826176 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -35,8 +35,6 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 typedef struct PNGDecContext {
     PNGDSPContext dsp;
     AVCodecContext *avctx;
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index aa14c24270..dc86171690 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -33,8 +33,6 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 #define IOBUF_SIZE 4096
 
 typedef struct PNGEncContext {
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 8ee33910bf..8d4f759707 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -32,8 +32,6 @@
 #include "mpeg4video.h"
 #include "h263.h"
 
-//#define DEBUG
-
 #define RV_GET_MAJOR_VER(x)  ((x) >> 28)
 #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)
 #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF)
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 35f9dea417..9b47d2e9ea 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -40,8 +40,6 @@
 #include "rv34data.h"
 #include "rv34.h"
 
-//#define DEBUG
-
 static inline void ZERO8x2(void* dst, int stride)
 {
     fill_rectangle(dst,                 1, 2, stride, 0, 4);
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 8b4ca5acfb..cd00b88c0c 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -28,7 +28,6 @@
  */
 
 #define BITSTREAM_READER_LE
-//#define DEBUG
 #include <limits.h>
 #include "avcodec.h"
 #include "get_bits.h"