[FFmpeg-cvslog] Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'

Michael Niedermayer git at videolan.org
Mon Jul 8 05:08:39 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 05:02:52 2013 +0200| [d28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9] | committer: Michael Niedermayer

Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'

* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
	libavformat/westwood_vqa.c

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

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





More information about the ffmpeg-cvslog mailing list