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

Merge commit '73e8fab3' 


* commit '73e8fab3':
  h264: print values in case of error

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5cbd7ce0 73e8fab3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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