Michael Niedermayer 0c25c398da Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1' ...

* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-05-24 11:51:58 +02:00

61 KiB

Raw Blame History

View Raw