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/svq3.c | |
| parent | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff) | |
| parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
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/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 8fa9c168fb..8239cfa98d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1144,7 +1144,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, (s->pict_type == AV_PICTURE_TYPE_P && mb_type < 8) ? (mb_type - 1) : -1; } - ff_draw_horiz_band(s, 16 * s->mb_y, 16); + ff_mpeg_draw_horiz_band(s, 16 * s->mb_y, 16); } left = buf_size*8 - get_bits_count(&s->gb); |