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/intrax8.c | |
| parent | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff) | |
| parent | 1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff) | |
| download | android_external_ffmpeg-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.tar.gz android_external_ffmpeg-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.tar.bz2 android_external_ffmpeg-ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4.zip | |
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/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index be524d6be7..5b76942add 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -776,7 +776,7 @@ int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_of s->dest[0]+= 8; } if(s->mb_y&1){ - ff_draw_horiz_band(s, (s->mb_y-1)*8, 16); + ff_mpeg_draw_horiz_band(s, (s->mb_y-1)*8, 16); } } |