Skip to content
Snippets Groups Projects
Commit 7cd13f61 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '0d8b943d' 


* commit '0d8b943d':
  h264_sei: Return meaningful values

Conflicts:
	libavcodec/h264_sei.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bdccfc3f 0d8b943d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 11 deletions
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