ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Sun Dec
21 04:29:22 2014 +0100| [9bbe24d455a35a91e3b19303922ce4d58fa8d4ad] | committer:
Michael Niedermayer
Merge commit '03dba25a4001495226651068232b4c6b1e75fd02' into release/1.1
* commit '03dba25a4001495226651068232b4c6b1e75fd02':
mmvideo: check frame dimensions
Conflicts:
libavcodec/mmvideo.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bbe24d455a35a91e3b19303922ce4d58fa8d4ad
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
