diff options
| author | Martin Storsjö <martin@martin.st> | 2012-10-18 10:30:03 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-10-18 14:26:14 +0300 |
| commit | eaa9b2e66c04d234eab85e2991d756ee36858808 (patch) | |
| tree | 60d2148a0dfe32dc65d03f4c01d1d6470fcef643 /libavcodec/mpeg12.c | |
| parent | fc085c5b33a966ad893757ab1c4269bf829ce499 (diff) | |
| download | ffmpeg-eaa9b2e66c04d234eab85e2991d756ee36858808.tar.gz | |
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
This table doesn't need to be shared with libavformat any longer.
Add mpeg12 to the name to make it less ambiguous, while renaming it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index a5dcccf3dc..df8afec611 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1239,8 +1239,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) { //MPEG-1 fps - avctx->time_base.den = avpriv_frame_rate_tab[s->frame_rate_index].num; - avctx->time_base.num = avpriv_frame_rate_tab[s->frame_rate_index].den; + avctx->time_base.den = ff_mpeg12_frame_rate_tab[s->frame_rate_index].num; + avctx->time_base.num = ff_mpeg12_frame_rate_tab[s->frame_rate_index].den; //MPEG-1 aspect avctx->sample_aspect_ratio = av_d2q(1.0/ff_mpeg1_aspect[s->aspect_ratio_info], 255); avctx->ticks_per_frame=1; @@ -1248,8 +1248,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) //MPEG-2 fps av_reduce(&s->avctx->time_base.den, &s->avctx->time_base.num, - avpriv_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, - avpriv_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, + ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num*2, + ff_mpeg12_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, 1 << 30); avctx->ticks_per_frame = 2; //MPEG-2 aspect |