summaryrefslogtreecommitdiff
path: root/libavcodec/dxva2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-16 19:00:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-16 19:00:39 +0100
commitddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (patch)
tree6b89fa0cc6e1afa4f4e6f5fe8275ef54984bd9da /libavcodec/dxva2.c
parent1fad547cefb4d2f3ed3d764b547ee16cf399e477 (diff)
parent1d0feb5d1ac04d187b335f0e8d411c9f40b3a885 (diff)
downloadffmpeg-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/dxva2.c')
-rw-r--r--libavcodec/dxva2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c
index d8660710d6..148437a5e3 100644
--- a/libavcodec/dxva2.c
+++ b/libavcodec/dxva2.c
@@ -147,6 +147,6 @@ end:
}
if (!result)
- ff_draw_horiz_band(s, 0, s->avctx->height);
+ ff_mpeg_draw_horiz_band(s, 0, s->avctx->height);
return result;
}