diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:56:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:56:05 +0100 |
| commit | 2bfcd74ad3e331e995755ac865abc370d3e544c8 (patch) | |
| tree | dcdba816d1ad5f5f4687d8aa62beba0519508d21 /libavcodec | |
| parent | 016c00cf68a481000f48ece6c11f622ba65e8045 (diff) | |
| parent | e557584aa7df6ac9f52af7ee7e5c963437da2e2f (diff) | |
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f':
mpeg12: Move Mpeg1Context declaration to the only place it is used
Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.h | 15 | ||||
| -rw-r--r-- | libavcodec/mpeg12dec.c | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index a0b906d4b0..b4ebd23fa8 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -41,21 +41,6 @@ extern VLC ff_mb_btype_vlc; extern VLC ff_mb_pat_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 tmpgexs; - int extradata_decoded; -} Mpeg1Context; - extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; void ff_mpeg12_common_init(MpegEncContext *s); diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b432f6ac5e..9221fc3915 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -40,6 +40,21 @@ #include "xvmc_internal.h" #include "thread.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 tmpgexs; + int extradata_decoded; +} Mpeg1Context; + /* as H.263, but only 17 codes */ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred) { |