[FFmpeg-cvslog] Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
Michael Niedermayer
git at videolan.org
Wed Apr 23 20:56:18 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 23 20:47:13 2014 +0200| [56efd98a6574641a32f08cd5123725cef28a309b] | committer: Michael Niedermayer
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56efd98a6574641a32f08cd5123725cef28a309b
---
More information about the ffmpeg-cvslog
mailing list