Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:13:51 +0000 (00:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:13:54 +0000 (00:13 +0200)
commite1296b5fa4e54941dcc68136022d71dfff01e214
treea379a952a8f70763c5b339167aef685e0eb4535f
parent4ecc9a2f31bfafd5438558311f858ad4c7138214
parentb5c1c16247ab7d166c84eaf4564e49a1535fdaaf
Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'

* commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf':
  asfdec: do not align Data Object when Broadcast Flag is set

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