aboutsummaryrefslogtreecommitdiffstats
path: root/RELEASE_NOTES
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-05 20:55:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-05 20:55:56 +0100
commit22ad0546c8ab1728c69281145c92f3538d2408c1 (patch)
tree74b4ec68da0067513ed17c2ce89fdcd3a764c325 /RELEASE_NOTES
parent777179edb5ad3000e3c74d04db4f9affe1a170b6 (diff)
parentad786dd450f26ecfbd35bb26e8b149664ecde049 (diff)
downloadffmpeg-22ad0546c8ab1728c69281145c92f3538d2408c1.tar.gz
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>
Diffstat (limited to 'RELEASE_NOTES')
0 files changed, 0 insertions, 0 deletions