Commit 22ad0546 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'ad786dd4'

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

Conflicts:
	libavcodec/h264_slice.c

See: 64591f8fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 777179ed ad786dd4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment