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

Merge commit '809c3023' 


* commit '809c3023':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a
See: a2f680c7
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 24af050c 809c3023
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 9 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