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/mpegvideo_xvmc.c | |
parent | 9c712d0b1608ec998dbe41d81a79f3fb7ea32b4d (diff) | |
parent | 835f798c7d20bca89eb4f3593846251ad0d84e4b (diff) |
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/mpegvideo_xvmc.c')
-rw-r--r-- | libavcodec/mpegvideo_xvmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 7d7f7ecb9f..d4631cba1e 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -182,7 +182,7 @@ static void ff_xvmc_decode_mb(struct MpegEncContext *s) return; } - // from MPV_decode_mb(), update DC predictors for P macroblocks + // from ff_mpv_decode_mb(), update DC predictors for P macroblocks if (!s->mb_intra) { s->last_dc[0] = s->last_dc[1] = |