Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

[ffmpeg] / libavcodec / txd.c

diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 523e1e62ad5357265c4c090407a18991f218a50c..a526035da83a615d8e1ab00f7fb6393fd3778a19 100644 (file)
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -25,7 +25,6 @@
 #include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
-#include "bytestream.h"
 #include "s3tc.h"
 
 typedef struct TXDContext {
@@ -69,9 +68,9 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     }
 
     if (depth == 8) {
-        avctx->pix_fmt = PIX_FMT_PAL8;
+        avctx->pix_fmt = AV_PIX_FMT_PAL8;
     } else if (depth == 16 || depth == 32) {
-        avctx->pix_fmt = PIX_FMT_RGB32;
+        avctx->pix_fmt = AV_PIX_FMT_RGB32;
     } else {
         av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth);
         return -1;