diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:00:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:11:56 +0200 |
| commit | c1df467d73ee8c6e792ec27c126c5f0e2bc1af9d (patch) | |
| tree | f25896738e158d2744a4e72b1e21618cda4ba3bb /libavcodec/mpeg12enc.c | |
| parent | 9c712d0b1608ec998dbe41d81a79f3fb7ea32b4d (diff) | |
| parent | 835f798c7d20bca89eb4f3593846251ad0d84e4b (diff) | |
| download | ffmpeg-c1df467d73ee8c6e792ec27c126c5f0e2bc1af9d.tar.gz | |
Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b':
mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes
Conflicts:
libavcodec/h261dec.c
libavcodec/intrax8.c
libavcodec/mjpegenc.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12enc.c')
| -rw-r--r-- | libavcodec/mpeg12enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 0dbcda86bf..6275a83667 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -147,7 +147,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && avctx->height > 2800) avctx->thread_count = 1; - if (ff_MPV_encode_init(avctx) < 0) + if (ff_mpv_encode_init(avctx) < 0) return -1; if (find_frame_rate_index(s) < 0) { @@ -1149,8 +1149,8 @@ AVCodec ff_mpeg1video_encoder = { .id = AV_CODEC_ID_MPEG1VIDEO, .priv_data_size = sizeof(MpegEncContext), .init = encode_init, - .encode2 = ff_MPV_encode_picture, - .close = ff_MPV_encode_end, + .encode2 = ff_mpv_encode_picture, + .close = ff_mpv_encode_end, .supported_framerates = ff_mpeg12_frame_rate_tab + 1, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, @@ -1165,8 +1165,8 @@ AVCodec ff_mpeg2video_encoder = { .id = AV_CODEC_ID_MPEG2VIDEO, .priv_data_size = sizeof(MpegEncContext), .init = encode_init, - .encode2 = ff_MPV_encode_picture, - .close = ff_MPV_encode_end, + .encode2 = ff_mpv_encode_picture, + .close = ff_mpv_encode_end, .supported_framerates = ff_mpeg2_frame_rate_tab, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, |