* commit 'af11fa54':
  mjpegb: Detect changing number of planes in interlaced video

Conflicts:
	libavcodec/mjpegdec.c

See: ecc31630Merged-by: Michael Niedermayer <michaelni@gmx.at>