diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 19:00:39 +0100 |
| commit | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (patch) | |
| tree | 6b89fa0cc6e1afa4f4e6f5fe8275ef54984bd9da /libavcodec/mpeg12.c | |
| parent | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff) | |
| parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
| download | ffmpeg-streaming-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.zip ffmpeg-streaming-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.tar.gz | |
Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'
* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
mpegvideo: split ff_draw_horiz_band().
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 985a956..6462529 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1809,7 +1809,7 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, if (++s->mb_x >= s->mb_width) { const int mb_size = 16 >> s->avctx->lowres; - ff_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size); + ff_mpeg_draw_horiz_band(s, mb_size*(s->mb_y >> field_pic), mb_size); ff_MPV_report_decode_progress(s); s->mb_x = 0; |
