Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 10:05:50 +0000 (12:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 May 2013 10:10:57 +0000 (12:10 +0200)
* qatar/master:
  mpegvideo: allocate sufficiently large scratch buffer for interlaced vid

Conflicts:
libavcodec/mpegvideo.c

See: 73db0bf1b06084022db5f42377b3b7960b3d3f5e

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

Trivial merge