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/mss2.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/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 35c5d2722d..4d53f8ab8f 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -397,8 +397,8 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, avctx->pix_fmt = AV_PIX_FMT_YUV420P; - if ((ret = ff_MPV_frame_start(s, avctx)) < 0) { - av_log(v->s.avctx, AV_LOG_ERROR, "ff_MPV_frame_start error\n"); + if ((ret = ff_mpv_frame_start(s, avctx)) < 0) { + av_log(v->s.avctx, AV_LOG_ERROR, "ff_mpv_frame_start error\n"); avctx->pix_fmt = AV_PIX_FMT_RGB24; return ret; } @@ -418,7 +418,7 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, ff_er_frame_end(&s->er); - ff_MPV_frame_end(s); + ff_mpv_frame_end(s); f = s->current_picture.f; |