ffmpeg | branch: release/2.4 | Michael Niedermayer <michae...@gmx.at> | Tue Dec
2 12:40:20 2014 +0100| [309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3] | committer:
Michael Niedermayer
Merge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4
* commit '60ccc1a748bf3d26201411479146d0798e1ecff9':
Update changelog for v11.1
Conflicts:
Changelog
Not merged, the changelog does not match FFmpeg
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
