[FFmpeg-cvslog] Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'
Michael Niedermayer
git at videolan.org
Tue Sep 17 16:45:06 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 16:39:16 2013 +0200| [8fc441cee89cb3af5026facd7fc622074747e223] | committer: Michael Niedermayer
Merge commit 'c39f7eba01cd656e8f0eed592f93d11814736650'
* commit 'c39f7eba01cd656e8f0eed592f93d11814736650':
truemotion2: Use av_freep properly in an error path
Conflicts:
libavcodec/truemotion2.c
See: c54aa2fb0f869ec025933944cbd1634fffe95d09
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fc441cee89cb3af5026facd7fc622074747e223
---
More information about the ffmpeg-cvslog
mailing list