Commit 89e705cd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '74d7db58'

* commit '74d7db58':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

See: 5307fa00Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a2f05d33 74d7db58
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