[FFmpeg-cvslog] Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
Michael Niedermayer
git at videolan.org
Thu Feb 19 20:49:47 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 19 20:39:04 2015 +0100| [560eb7179a7c46ba277c9c120840816869a47a70] | committer: Michael Niedermayer
Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
* commit '31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=560eb7179a7c46ba277c9c120840816869a47a70
---
More information about the ffmpeg-cvslog
mailing list