Commit fbd4293d authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

remove more useless mpegvideo.h includes

Originally committed as revision 12323 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cbcd6c8c
......@@ -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);
......
......@@ -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();
......
......@@ -35,7 +35,6 @@
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
typedef struct CyuvDecodeContext {
......
......@@ -29,7 +29,6 @@
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "simple_idct.h"
#include "faandct.h"
#include "faanidct.h"
......
......@@ -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"
......
......@@ -29,7 +29,6 @@
*/
#include "avcodec.h"
#include "mpegvideo.h"
#include "eval.h"
#include <stdio.h>
......
......@@ -26,7 +26,6 @@
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "bytestream.h"
#include "indeo3data.h"
......
......@@ -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];
......
......@@ -25,7 +25,6 @@
*/
#include "avcodec.h"
#include "mpegvideo.h"
typedef struct QpegContext{
AVCodecContext *avctx;
......
......@@ -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 '?';
}
}
......
......@@ -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();
......
......@@ -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];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment