Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:55:56 +0000 (20:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Mar 2015 19:55:56 +0000 (20:55 +0100)
commit22ad0546c8ab1728c69281145c92f3538d2408c1
tree74b4ec68da0067513ed17c2ce89fdcd3a764c325
parent777179edb5ad3000e3c74d04db4f9affe1a170b6
parentad786dd450f26ecfbd35bb26e8b149664ecde049
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'

* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
  h264: remove a now redundant error check

Conflicts:
libavcodec/h264_slice.c

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>