[FFmpeg-cvslog] Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
Michael Niedermayer
git at videolan.org
Mon Jun 17 00:43:29 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 17 00:36:25 2013 +0200| [6c655b40eaceb77a8f4a8f32775db969935de746] | committer: Michael Niedermayer
Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c'
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
smacker: check the return value of smacker_decode_tree
Conflicts:
libavcodec/smacker.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c655b40eaceb77a8f4a8f32775db969935de746
---
More information about the ffmpeg-cvslog
mailing list