Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:21:56 +0000 (20:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:22:16 +0000 (20:22 +0200)
commit2bf87dcc2d3079ead09b250df6932c94ff13504c
treeba8b9cfcc3d9a06fea0a441f09eccc0908d5531c
parent4e70104aba4269770c36fc6e0ec975b7a061d028
parenta7e541c9926d531a100ba0d36f4e56956dd84651
Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'

* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
  h264: fix interpretation of interleved stereo modes

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