summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/4xm.c10
-rw-r--r--libavcodec/cljr.c7
-rw-r--r--libavcodec/cyuv.c1
-rw-r--r--libavcodec/dsputil.c1
-rw-r--r--libavcodec/dv.c2
-rw-r--r--libavcodec/eval.c1
-rw-r--r--libavcodec/indeo3.c1
-rw-r--r--libavcodec/qdrw.c3
-rw-r--r--libavcodec/qpeg.c1
-rw-r--r--libavcodec/utils.c13
-rw-r--r--libavcodec/vcr1.c6
-rw-r--r--libavcodec/xl.c3
12 files changed, 21 insertions, 28 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index d833a3b186..13cd66fb85 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -26,7 +26,7 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
#include "bytestream.h"
//#undef NDEBUG
@@ -756,15 +756,15 @@ static int decode_frame(AVCodecContext *avctx,
}
if(frame_4cc == ff_get_fourcc("ifr2")){
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
if(decode_i2_frame(f, buf-4, frame_size) < 0)
return -1;
}else if(frame_4cc == ff_get_fourcc("ifrm")){
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
if(decode_i_frame(f, buf, frame_size) < 0)
return -1;
}else if(frame_4cc == ff_get_fourcc("pfrm") || frame_4cc == ff_get_fourcc("pfr2")){
- p->pict_type= P_TYPE;
+ p->pict_type= FF_P_TYPE;
if(decode_p_frame(f, buf, frame_size) < 0)
return -1;
}else if(frame_4cc == ff_get_fourcc("snd_")){
@@ -773,7 +773,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "ignoring unknown chunk length:%d\n", buf_size);
}
- p->key_frame= p->pict_type == I_TYPE;
+ p->key_frame= p->pict_type == FF_I_TYPE;
*picture= *p;
*data_size = sizeof(AVPicture);
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 6b76411ac7..31bec631fd 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -25,7 +25,8 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "bitstream.h"
typedef struct CLJRContext{
AVCodecContext *avctx;
@@ -52,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
init_get_bits(&a->gb, buf, buf_size);
@@ -89,7 +90,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
int mb_x, mb_y;
*p = *pict;
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
emms_c();
diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
index c36495ec6d..c7fe130bce 100644
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@@ -35,7 +35,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
typedef struct CyuvDecodeContext {
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index cfe3666b5c..ee02062479 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -29,7 +29,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
#include "simple_idct.h"
#include "faandct.h"
#include "faanidct.h"
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 66c6d3c110..7fa27aedaf 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -36,7 +36,7 @@
#define ALT_BITSTREAM_READER
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
+#include "bitstream.h"
#include "simple_idct.h"
#include "dvdata.h"
diff --git a/libavcodec/eval.c b/libavcodec/eval.c
index dc0012bf67..25e8178506 100644
--- a/libavcodec/eval.c
+++ b/libavcodec/eval.c
@@ -29,7 +29,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
#include "eval.h"
#include <stdio.h>
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 9237b5ec20..78dc6f9890 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -26,7 +26,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
#include "bytestream.h"
#include "indeo3data.h"
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 0ee9a8f7c2..78283f6cc0 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct QdrawContext{
AVCodecContext *avctx;
@@ -52,7 +51,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
outdata = a->pic.data[0];
diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 5f902e3043..03e97b304d 100644
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct QpegContext{
AVCodecContext *avctx;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d40428a286..4e93229004 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -27,7 +27,6 @@
#include "avcodec.h"
#include "dsputil.h"
-#include "mpegvideo.h"
#include "integer.h"
#include "opt.h"
#include "crc.h"
@@ -1284,12 +1283,12 @@ void avcodec_default_free_buffers(AVCodecContext *s){
char av_get_pict_type_char(int pict_type){
switch(pict_type){
- case I_TYPE: return 'I';
- case P_TYPE: return 'P';
- case B_TYPE: return 'B';
- case S_TYPE: return 'S';
- case SI_TYPE:return 'i';
- case SP_TYPE:return 'p';
+ case FF_I_TYPE: return 'I';
+ case FF_P_TYPE: return 'P';
+ case FF_B_TYPE: return 'B';
+ case FF_S_TYPE: return 'S';
+ case FF_SI_TYPE:return 'i';
+ case FF_SP_TYPE:return 'p';
default: return '?';
}
}
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 30fc302d1d..d43faad53e 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -25,7 +25,7 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
//#undef NDEBUG
//#include <assert.h>
@@ -55,7 +55,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
for(i=0; i<16; i++){
@@ -122,7 +122,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
int mb_x, mb_y;
*p = *pict;
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
emms_c();
diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index b48a369b8b..e1fd909186 100644
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
-#include "mpegvideo.h"
typedef struct VideoXLContext{
AVCodecContext *avctx;
@@ -58,7 +57,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- p->pict_type= I_TYPE;
+ p->pict_type= FF_I_TYPE;
p->key_frame= 1;
Y = a->pic.data[0];
View Lorry Controller Status