Merge commit '67134ad31f1f3bc1515eae129e4368401f7c3342' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:51:22 +0000 (18:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:51:29 +0000 (18:51 +0200)
commit0dc5868f141c1877dc530437643cc927f1c158b3
tree5346a6ed2b3e5376a730b6205b57685984d04e95
parent723512ac71716d1f27ed33f4742913cba3e47ae5
parent67134ad31f1f3bc1515eae129e4368401f7c3342
Merge commit '67134ad31f1f3bc1515eae129e4368401f7c3342' into release/2.2

* commit '67134ad31f1f3bc1515eae129e4368401f7c3342':
  h264: fix interpretation of interleaved stereo modes

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