Commit e0b45ca7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b3dc260e'

* commit 'b3dc260e':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4dcb2f74 b3dc260e
This diff is collapsed.
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