Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:18:13 +0000 (11:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:18:20 +0000 (11:18 +0200)
* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
  asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec

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

Simple merge
Simple merge