ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Mar 12
21:30:37 2015 +0100| [9ecfe0b87834576ce69401067fe1130a723eb2d4] | committer:
Michael Niedermayer
Merge commit 'a72d93daa09ffbad2771f1450820941055eaf210'
* commit 'a72d93daa09ffbad2771f1450820941055eaf210':
mpegvideo_enc: Check AVCodecContext allocation
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ecfe0b87834576ce69401067fe1130a723eb2d4
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
