[FFmpeg-cvslog] Merge commit 'd14696c99ccac12a052ce10e70859ffc0293ed6a' into release/2.2

Michael Niedermayer git at videolan.org
Sat Sep 20 17:46:37 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 20 17:42:00 2014 +0200| [6dd718e416c05ddc0cdc03f28769e303e2eaafb7] | committer: Michael Niedermayer

Merge commit 'd14696c99ccac12a052ce10e70859ffc0293ed6a' into release/2.2

* commit 'd14696c99ccac12a052ce10e70859ffc0293ed6a':
  apetag: Fix APE tag size check

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

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





More information about the ffmpeg-cvslog mailing list