Michael Niedermayer 560eb7179a 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>
2015-02-19 20:39:04 +01:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-02-19 11:30:30 +01:00
2015-02-14 20:48:50 +01:00
2014-12-01 00:31:06 +01:00
2015-02-02 05:04:14 +01:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2015-02-02 05:04:14 +01:00
2014-07-17 11:29:01 +02:00