Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 10:27:32 +0000 (12:27 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 10:27:35 +0000 (12:27 +0200)
commit90696ef368819a1a0576c0c96ce4349dd726dd4f
tree73521a3816930c3385f250f4e0aed27affaf36e9
parentb940145c67dbb2114bc231a36a4549de315504a9
parent9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe
Merge commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe'

* commit '9e8627a1ff9207b9e272d248da2e1bd0cc6fe2fe':
  asfdec: interpret the first flag in an asf packet as length flag

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/asfdec_o.c