Changeset d8d235ff in ffmpeg

Timestamp:

Sep 27, 2013, 11:27:31 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4d86a945

Parents:

fc424f37 (diff), 5c349ad0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)