diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:29:24 +0200 |
| commit | b0554fec0470bf59b0582c80697d28646e37b854 (patch) | |
| tree | 1f111a02df3a1e29f29ed963fb32ccfa72f2cce1 /libavcodec/mpeg12enc.c | |
| parent | d50aa006fb3430bedc3872ba10e028a714499625 (diff) | |
| parent | c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72 (diff) | |
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 42731eb392..c6154170e8 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -117,7 +117,7 @@ static int find_frame_rate_index(MpegEncContext *s){ for (ext.num=1; ext.num <= 4; ext.num++) { for (ext.den=1; ext.den <= 32; ext.den++) { - AVRational q = av_mul_q(ext, avpriv_frame_rate_tab[i]); + AVRational q = av_mul_q(ext, ff_mpeg12_frame_rate_tab[i]); if(s->codec_id != AV_CODEC_ID_MPEG2VIDEO && (ext.den!=1 || ext.num!=1)) continue; @@ -189,7 +189,7 @@ static av_cold int encode_init(AVCodecContext *avctx) } if (s->tc_opt_str) { - AVRational rate = avpriv_frame_rate_tab[s->frame_rate_index]; + AVRational rate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; int ret = av_timecode_init_from_string(&s->tc, rate, s->tc_opt_str, s); if (ret < 0) return ret; @@ -222,7 +222,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); @@ -982,7 +982,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, |