mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-29 09:40:48 +00:00
Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'
* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
h264: remove a now redundant error check
Conflicts:
libavcodec/h264_slice.c
See: 64591f8f86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
22ad0546c8