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)
* commit 'e91a3f1bdba9b4945e42c191d2e35e9844625fb4':
  dxtory: correctly handle YUV slices with average odd height

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

Simple merge