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

Merge commit '4e03b209' 


* commit '4e03b209':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 28b1698a 4e03b209
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 5 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