]> git.sesse.net Git - ffmpeg/commit
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 20:30:37 +0000 (21:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 20:30:37 +0000 (21:30 +0100)
commit9ecfe0b87834576ce69401067fe1130a723eb2d4
treecfc802dd3308e6d1c27bb1ad50fdd0cd763932d9
parent0bc2da6dcf17e599f3d7dc6bb22880510c2a11a9
parenta72d93daa09ffbad2771f1450820941055eaf210
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'

* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
  mpegvideo_enc: Check AVCodecContext allocation

Conflicts:
libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo_enc.c