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

Merge commit '3a56bcee' 


* commit '3a56bcee':
  mpeg12dec: Use more specific error codes

Conflicts:
	libavcodec/mpeg12dec.c

See: 1852b2a0
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bcc43de5 3a56bcee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 14 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