[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Mon Sep 23 14:53:27 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 14:47:01 2013 +0200| [552945efe62d0b6605efa2f5ad7b788c728d71b5] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenchint: Clear size and len if the realloc failed

Conflicts:
	libavformat/movenchint.c

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

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





More information about the ffmpeg-cvslog mailing list