Commit 9d1155da authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'aeb23fc4'

* commit 'aeb23fc4':
  avprobe: Remove a pointless check

Conflicts:
	avprobe.c

No change as the code does not exist in ffprobe
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ee73a690 aeb23fc4
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