[FFmpeg-cvslog] Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 28 00:13:51 2015 +0200| [e1296b5fa4e54941dcc68136022d71dfff01e214] | committer: Michael Niedermayer

Merge commit 'b5c1c16247ab7d166c84eaf4564e49a1535fdaaf'

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

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1296b5fa4e54941dcc68136022d71dfff01e214
---