Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 09:51:58 +0000 (11:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 09:51:58 +0000 (11:51 +0200)
commit0c25c398dab033cda0e28ca074505e47d7480d76
treeaeec8f420151ce0d6ad7f35d9b511cf8d23b9255
parentac0ade26458dfe6f37c3f6c1078483315948fd9c
parentb493847df4ff8ce46f258749e4a3f304696b34c1
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h