Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:14:18 +0000 (22:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:15:28 +0000 (22:15 +0200)
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
  mpjpgdec: free AVIOContext leak on early probe fail

Conflicts:
libavformat/mpjpegdec.c

See: 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mpjpegdec.c

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