Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 19:39:04 +0000 (20:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 19:39:04 +0000 (20:39 +0100)
commit560eb7179a7c46ba277c9c120840816869a47a70
treef2b3b551efdfad47ee5209968fa79f0d882092d3
parente3755119fae71c9e34b630679c2805fcf1c97e2c
parent31d2039cb42668ebcf08248bc48bbad44aa05f49
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@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264_parser.c
libavcodec/parser.c
libavcodec/version.h