diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2006-07-02 14:50:23 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-07-02 14:50:23 +0000 |
| commit | 761089b028e6bffb5994b9dbadf5f7e72e618b0d (patch) | |
| tree | bd23bc57080a78153244685ca808579d4ea1c363 | |
| parent | 474176bf927870168a20413f2a9c28f09b6b1afa (diff) | |
| download | ffmpeg-761089b028e6bffb5994b9dbadf5f7e72e618b0d.tar.gz | |
staric frame_rate_tab -> non static ff_frame_rate_tab part of the cavs patch by (Stefan Gehrer stefan.gehrer gmx de)
Originally committed as revision 5578 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12.c | 16 | ||||
| -rw-r--r-- | libavcodec/mpeg12data.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index d805ae5903..6bbfe20069 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -200,7 +200,7 @@ static int find_frame_rate_index(MpegEncContext *s){ int64_t d; for(i=1;i<14;i++) { - int64_t n0= 1001LL/frame_rate_tab[i].den*frame_rate_tab[i].num*s->avctx->time_base.num; + int64_t n0= 1001LL/ff_frame_rate_tab[i].den*ff_frame_rate_tab[i].num*s->avctx->time_base.num; int64_t n1= 1001LL*s->avctx->time_base.den; if(s->avctx->strict_std_compliance > FF_COMPLIANCE_INOFFICIAL && i>=9) break; @@ -262,7 +262,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA) if (s->current_picture.key_frame) { - AVRational framerate= frame_rate_tab[s->frame_rate_index]; + AVRational framerate= ff_frame_rate_tab[s->frame_rate_index]; /* mpeg1 header repeated every gop */ put_header(s, SEQ_START_CODE); @@ -2121,8 +2121,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID //mpeg1 fps - avctx->time_base.den = frame_rate_tab[s->frame_rate_index].num; - avctx->time_base.num= frame_rate_tab[s->frame_rate_index].den; + avctx->time_base.den= ff_frame_rate_tab[s->frame_rate_index].num; + avctx->time_base.num= ff_frame_rate_tab[s->frame_rate_index].den; //mpeg1 aspect avctx->sample_aspect_ratio= av_d2q( 1.0/mpeg1_aspect[s->aspect_ratio_info], 255); @@ -2132,8 +2132,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx){ av_reduce( &s->avctx->time_base.den, &s->avctx->time_base.num, - frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num, - frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, + ff_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num, + ff_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, 1<<30); //mpeg2 aspect if(s->aspect_ratio_info > 1){ @@ -3252,7 +3252,7 @@ AVCodec mpeg1video_encoder = { encode_init, MPV_encode_picture, MPV_encode_end, - .supported_framerates= frame_rate_tab+1, + .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, .capabilities= CODEC_CAP_DELAY, }; @@ -3265,7 +3265,7 @@ AVCodec mpeg2video_encoder = { encode_init, MPV_encode_picture, MPV_encode_end, - .supported_framerates= frame_rate_tab+1, + .supported_framerates= ff_frame_rate_tab+1, .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, -1}, .capabilities= CODEC_CAP_DELAY, }; diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index a6b49aa783..e9a10ff3a1 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -332,7 +332,7 @@ static const uint8_t mbMotionVectorTable[17][2] = { { 0xc, 10 }, }; -static const AVRational frame_rate_tab[] = { +const AVRational ff_frame_rate_tab[] = { { 0, 0}, {24000, 1001}, { 24, 1}, |