[FFmpeg-cvslog] Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
Michael Niedermayer
git at videolan.org
Sun Mar 29 12:15:23 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 29 11:32:24 2015 +0200| [268ff17cb785c3ae94be0aca31ed8709e149b487] | committer: Michael Niedermayer
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=268ff17cb785c3ae94be0aca31ed8709e149b487
---
More information about the ffmpeg-cvslog
mailing list