Merge commit '809c3023b699c54c90511913d3b6140dd2436550'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 11:45:56 +0000 (12:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 11:49:23 +0000 (12:49 +0100)
commit6c68522a2aa8c3fc664482ab8a18c991039c78aa
tree94cd9643941829de2e87f29fc217e3f2b4db8790
parent24af050c2fa9c28c85f68ac5425fc3fbaa826343
parent809c3023b699c54c90511913d3b6140dd2436550
Merge commit '809c3023b699c54c90511913d3b6140dd2436550'

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

Conflicts:
libavcodec/mjpegdec.c

See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c