ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun 22
22:33:46 2015 +0200| [55219a78c7d04d1937384366ba911c5d75c5c1e4] | committer:
Michael Niedermayer
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55219a78c7d04d1937384366ba911c5d75c5c1e4
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
