Merge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:22:03 +0000 (23:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 21:22:25 +0000 (23:22 +0200)
* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge