Commit d37f007d authored by Aurelien Jacobs's avatar Aurelien Jacobs

remove #include "mpegvideo.h" where it is not needed

Originally committed as revision 12321 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3bfe9260
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h" #include "bitstream.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpeg12data.h"
//#undef NDEBUG //#undef NDEBUG
//#include <assert.h> //#include <assert.h>
...@@ -402,7 +402,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -402,7 +402,7 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
...@@ -476,7 +476,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, ...@@ -476,7 +476,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
init_put_bits(&a->pb, buf, buf_size); init_put_bits(&a->pb, buf, buf_size);
*p = *pict; *p = *pict;
p->pict_type= I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
for(mb_y=0; mb_y<a->mb_height2; mb_y++){ for(mb_y=0; mb_y<a->mb_height2; mb_y++){
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "bitstream.h" #include "bitstream.h"
#include "dnxhddata.h" #include "dnxhddata.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
......
...@@ -332,7 +332,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) ...@@ -332,7 +332,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
s->picture.pict_type= I_TYPE; s->picture.pict_type= FF_I_TYPE;
s->picture.key_frame= 1; s->picture.key_frame= 1;
for(i=0; i<3; i++){ for(i=0; i<3; i++){
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h" #include "bitstream.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h"
#define MAX_COMPONENTS 4 #define MAX_COMPONENTS 4
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "bitstream.h"
#include "vp3data.h" #include "vp3data.h"
#include "xiph.h" #include "xiph.h"
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "bitstream.h" #include "bitstream.h"
#include "mpegvideo.h"
#include "vp56.h" #include "vp56.h"
#include "vp56data.h" #include "vp56data.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "vp56data.h" #include "vp56data.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "bitstream.h"
#include "bytestream.h" #include "bytestream.h"
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "dsputil.h" #include "dsputil.h"
#include "bitstream.h" #include "bitstream.h"
#include "huffman.h" #include "huffman.h"
#include "mpegvideo.h"
#include "vp56.h" #include "vp56.h"
#include "vp56data.h" #include "vp56data.h"
......
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