[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 13:27:31 2013 +0200| [d8d235ffe9c13ed129010f3d367a341fab448839] | committer: Michael Niedermayer

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 at gmx.at>

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