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/mpeg12enc.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/mpeg12enc.c')
| -rw-r--r-- | libavcodec/mpeg12enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 7048b5dc97..ceb31e0270 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -111,7 +111,7 @@ static int find_frame_rate_index(MpegEncContext *s){ int64_t d; for(i=1;i<14;i++) { - int64_t n0= 1001LL/avpriv_frame_rate_tab[i].den*avpriv_frame_rate_tab[i].num*s->avctx->time_base.num; + int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den * ff_mpeg12_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_UNOFFICIAL && i>=9) break; @@ -195,7 +195,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.f.key_frame) { - AVRational framerate= avpriv_frame_rate_tab[s->frame_rate_index]; + AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; /* mpeg1 header repeated every gop */ put_header(s, SEQ_START_CODE); @@ -958,7 +958,7 @@ AVCodec ff_mpeg1video_encoder = { .init = encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .supported_framerates = avpriv_frame_rate_tab+1, + .supported_framerates = ff_mpeg12_frame_rate_tab + 1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, @@ -974,7 +974,7 @@ AVCodec ff_mpeg2video_encoder = { .init = encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, - .supported_framerates = avpriv_frame_rate_tab + 1, + .supported_framerates = ff_mpeg12_frame_rate_tab + 1, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, |