Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:39:12 +0000 (12:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:39:17 +0000 (12:39 +0100)
* commit '84b721db366c0734fdfd23c8daaa7da7da21f761':
  asfdec: also read Metadata Library Object

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/asf.c
libavformat/asf.h
libavformat/asfdec.c

Simple merge
Simple merge
Simple merge