aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-24 11:51:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-24 11:51:58 +0200
commit0c25c398dab033cda0e28ca074505e47d7480d76 (patch)
treeaeec8f420151ce0d6ad7f35d9b511cf8d23b9255 /libavutil/x86
parentac0ade26458dfe6f37c3f6c1078483315948fd9c (diff)
parentb493847df4ff8ce46f258749e4a3f304696b34c1 (diff)
downloadffmpeg-0c25c398dab033cda0e28ca074505e47d7480d76.tar.gz
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>
Diffstat (limited to 'libavutil/x86')
0 files changed, 0 insertions, 0 deletions