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)
commitc6b425896541c6cc0b58c1aceb8821333f4049bc
tree9a97ed7e1222c52797213338b7120d8cf2bfbe43
parentc6526620a9a802e89f92c7f3469a6adbb321970c
parent1eb932803037a3c9f98f66aeb80024dfa3c5c743
Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'

* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
  asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec

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