Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 11:27:31 +0000 (13:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Sep 2013 11:27:31 +0000 (13:27 +0200)
commitd8d235ffe9c13ed129010f3d367a341fab448839
tree342f9ac420ccfe6d9fb9a361e4622a7adf6b761c
parentfc424f37a37ee6ba6fb679db746775b63f602267
parent5c349ad08a9fa930ddd9339f5de83eb818a0994c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lxf: check the nb_streams instead of relying on padding

Conflicts:
libavformat/lxfdec.c

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