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/svq1enc.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/svq1enc.c')
-rw-r--r-- | libavcodec/svq1enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 95dcee4466..af18d38862 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -489,7 +489,7 @@ static av_cold int svq1_encode_end(AVCodecContext *avctx) avctx->frame_number)); s->m.mb_type = NULL; - ff_MPV_common_end(&s->m); + ff_mpv_common_end(&s->m); av_freep(&s->m.me.scratchpad); av_freep(&s->m.me.map); @@ -539,7 +539,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) s->avctx = avctx; s->m.avctx = avctx; - if ((ret = ff_MPV_common_init(&s->m)) < 0) { + if ((ret = ff_mpv_common_init(&s->m)) < 0) { svq1_encode_end(avctx); return ret; } |