OSDN Git Service

Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 10:56:15 +0000 (11:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Mar 2013 10:56:29 +0000 (11:56 +0100)
commit6c8ac2d78230990f3a01be28d3ef68fb281d6609
tree9844728ecb492e32ff03026b64501b42213c0559
parent82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7
parent1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5
Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'

* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
  fate: add tests for h264 decoder reinit
  h264: fix bit depth changes with frame threading

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