[FFmpeg-cvslog] Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31'
Michael Niedermayer
git at videolan.org
Mon Jun 3 12:40:00 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 3 12:33:00 2013 +0200| [5c43f3ddea40fc76264d647750f6986a9247aead] | committer: Michael Niedermayer
Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31'
* commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31':
vmd: decode videos with no LZ buffer size provided - they might not need it
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c43f3ddea40fc76264d647750f6986a9247aead
---
More information about the ffmpeg-cvslog
mailing list