Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:06:09 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 09:06:23 +0000 (11:06 +0200)
commitc6526620a9a802e89f92c7f3469a6adbb321970c
treeed21006d6646c471026e1c3eefdc53ae70124f8d
parentc16470d77a1b693ea573e2925c3488847c5db939
parentc53b5dda352452e79a9e962cd4c74c813186d9ed
Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'

* commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
  asfdec: replace magic constant with DATA_HEADER_SIZE

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