virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

mpeg12: Move Mpeg1Context declaration to the only place it is used

Browse Source
This commit is contained in:
Diego Biurrun 2013-03-26 19:52:21 +01:00
parent 1b6d66745a
commit e557584aa7
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/mpeg12.h
View File

@ -41,21 +41,6 @@ extern VLC ff_mb_btype_vlc;
extern VLC ff_mb_pat_vlc; extern VLC ff_mb_pat_vlc;
extern VLC ff_mv_vlc; extern VLC ff_mv_vlc;
typedef struct Mpeg1Context {
MpegEncContext mpeg_enc_ctx;
int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
int repeat_field; /* true if we must repeat the field */
AVPanScan pan_scan; /**< some temporary storage for the panscan */
int slice_count;
int swap_uv;//indicate VCR2
int save_aspect_info;
int save_width, save_height, save_progressive_seq;
AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator
int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
int closed_gop; ///< GOP is closed
int extradata_decoded;
} Mpeg1Context;
extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
void ff_mpeg12_common_init(MpegEncContext *s); void ff_mpeg12_common_init(MpegEncContext *s);

15
libavcodec/mpeg12dec.c
View File

@ -43,6 +43,21 @@
//#undef NDEBUG //#undef NDEBUG
//#include <assert.h> //#include <assert.h>
typedef struct Mpeg1Context {
MpegEncContext mpeg_enc_ctx;
int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
int repeat_field; /* true if we must repeat the field */
AVPanScan pan_scan; /**< some temporary storage for the panscan */
int slice_count;
int swap_uv;//indicate VCR2
int save_aspect_info;
int save_width, save_height, save_progressive_seq;
AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator
int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
int closed_gop; ///< GOP is closed
int extradata_decoded;
} Mpeg1Context;
/* as H.263, but only 17 codes */ /* as H.263, but only 17 codes */
static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred)
{ {