aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-10-19 09:25:52 +0200
committerAnton Khirnov <anton@khirnov.net>2011-10-23 14:14:34 +0200
commitcc05a45d339d57214d647f5e01e91491c78a0b24 (patch)
treec4fc0b81c6d30e561bbca69154667694df09de11
parentacffe45732d5afc722c97a2736b62f84422c0778 (diff)
downloadffmpeg-cc05a45d339d57214d647f5e01e91491c78a0b24.tar.gz
mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h
It will be used in vdpau code.
-rw-r--r--libavcodec/mpeg12.c13
-rw-r--r--libavcodec/mpeg12.h13
2 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index cdccefbd7e..82dc53279f 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1106,19 +1106,6 @@ static int mpeg_decode_mb(MpegEncContext *s, DCTELEM block[12][64])
return 0;
}
-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?
-} Mpeg1Context;
-
static av_cold int mpeg_decode_init(AVCodecContext *avctx)
{
Mpeg1Context *s = avctx->priv_data;
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 4c55726160..b71ad5df7f 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -30,6 +30,19 @@
extern VLC ff_dc_lum_vlc;
extern VLC ff_dc_chroma_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?
+} 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);