Commit 2b1922d9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b452d5ae'

* commit 'b452d5ae':
  mpeg4videodec: move mpeg4-specific bug detection from h263 generic code to mpeg4

Conflicts:
	libavcodec/h263dec.c

not merged, the header decode function is not the right place
See: 6c9b82b6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c9b82b6 b452d5ae
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