Merge commit 'caf7be30'

* commit 'caf7be30':
  mpjpgdec: free AVIOContext leak on early probe fail

Conflicts:
	libavformat/mpjpegdec.c

See: 34d278f9, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

libavformat/mpjpegdec.c

@@ -101,8 +101,8 @@ static int mpjpeg_read_probe(AVProbeData *p)
             break;
         }
     }
-
 end:
+
     av_free(pb);
 
     return ret;