[FFmpeg-cvslog] Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

Michael Niedermayer git at videolan.org
Fri Nov 22 12:34:54 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 12:28:49 2013 +0100| [d7fbb63122b87347e57cd8a586adff09f8de5921] | committer: Michael Niedermayer

Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'

* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
  vc1: fix a memleak.

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7fbb63122b87347e57cd8a586adff09f8de5921
---





More information about the ffmpeg-cvslog mailing list