Changeset 143a19f5 in ffmpeg

Timestamp:

Sep 29, 2013, 10:32:01 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9834874f

Parents:

ccb6b05 (diff), c2319876 (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 commit 'c231987662194d009dd91bfc57c678e0e70ca161'

• commit 'c231987662194d009dd91bfc57c678e0e70ca161': mov: Make sure the read sample count is nonnegative

Conflicts:

libavformat/mov.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)