mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-02 03:00:47 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: allocate sufficiently large scratch buffer for interlaced vid
Conflicts:
libavcodec/mpegvideo.c
See: 73db0bf1b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1ec578c010