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

Merge commit 'a8b19271' 


* commit 'a8b19271':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 1607a985 a8b19271
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