ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=560eb7179a7c46ba277c9c120840816869a47a70
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
