ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Fri Aug 
 8 16:08:16 2014 +0200| [b52952c6e96b7f1464a3829da9d9fec28ed262b3] | committer: 
Michael Niedermayer

Merge commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4' into release/1.1

* commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4':
  Update Changelog for v9.15

Conflicts:
        Changelog

Not merged as the changelog doesnt apply 1:1 to FFmpeg

Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to