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/h264_slice.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/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index f1fbbdcbee..fc744f2f1a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -549,7 +549,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, #endif } /* update linesize on resize for h264. The h264 decoder doesn't - * necessarily call ff_MPV_frame_start in the new thread */ + * necessarily call ff_mpv_frame_start in the new thread */ h->linesize = h1->linesize; h->uvlinesize = h1->uvlinesize; @@ -783,7 +783,7 @@ static int h264_frame_start(H264Context *h) /* We mark the current picture as non-reference after allocating it, so * that if we break out due to an error it can be released automatically - * in the next ff_MPV_frame_start(). + * in the next ff_mpv_frame_start(). */ h->cur_pic_ptr->reference = 0; |