From 679481b3b61dda5e2827f9757bf8c12a8de193c9 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 10 Apr 2012 14:27:59 +0200
Subject: Drop some pointless #ifdefs.

The files are only compiled if the #ifdef conditions are met.
---
 libavcodec/libxvidff.c | 4 ----
 libavcodec/snowenc.c   | 2 --
 2 files changed, 6 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index b003d7e8e3..344f6033ff 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -114,8 +114,6 @@ int ff_tempfile(const char *prefix, char **filename) {
     return fd; /* success */
 }
 
-#if CONFIG_LIBXVID_ENCODER
-
 /**
  * Create the private context for the encoder.
  * All buffers are allocated, settings are loaded from the user,
@@ -830,5 +828,3 @@ AVCodec ff_libxvid_encoder = {
     .pix_fmts       = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },
     .long_name      = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 };
-
-#endif /* CONFIG_LIBXVID_ENCODER */
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 03d0afcab0..7b010e1f1c 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -152,7 +152,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i
 
 #endif /* QUANTIZE2==1 */
 
-#if CONFIG_SNOW_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx)
 {
     SnowContext *s = avctx->priv_data;
@@ -1925,4 +1924,3 @@ AVCodec ff_snow_encoder = {
     .long_name      = NULL_IF_CONFIG_SMALL("Snow"),
     .priv_class     = &snowenc_class,
 };
-#endif
-- 
cgit v1.2.3


From 9676d8eb67b00e1bb52e448c20c8f5cb6ad5e1ef Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 10 Apr 2012 18:18:40 +0200
Subject: interplayvideo: fix av_dlog parameter type mismatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libavcodec/interplayvideo.c:909:13: warning: format ‘%p’ expects argument of type ‘void *’, but argument 7 has type ‘GetByteContext’ [-Wformat]
---
 libavcodec/interplayvideo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 4732bf5325..bee7a68e52 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -907,8 +907,9 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
         for (x = 0; x < s->avctx->width; x += 8) {
             opcode = get_bits(&gb, 4);
 
-            av_dlog(NULL, "  block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
-                    x, y, opcode, s->stream_ptr);
+            av_dlog(s->avctx,
+                    "  block @ (%3d, %3d): encoding 0x%X, data ptr offset %d\n",
+                    x, y, opcode, bytestream2_tell(&s->stream_ptr));
 
             if (!s->is_16bpp) {
                 s->pixel_ptr = s->current_frame.data[0] + x
-- 
cgit v1.2.3