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

Merge commit '5d1c2e53' 


* commit '5d1c2e53':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

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

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6102dda1 5d1c2e53
No related branches found
No related tags found
No related merge requests 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