Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:01:27 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:01:36 +0000 (21:01 +0100)
commit9eb954b91d3676f2ae207149db2e7f5ee2353df4
tree8f341bf8680836e230794aa2f32f61a087caea88
parent57a0c5fa9ca27d34d794beaece2462251bc06c2a
parente91a3f1bdba9b4945e42c191d2e35e9844625fb4
Merge commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4'

* commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4':
  dxtory: correctly handle YUV slices with average odd height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxtory.c