Changeset 6659364d in ffmpeg

Timestamp:

Dec 14, 2013, 9:17:17 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

09c13ff7

Parents:

f357ef2e (diff), 797f2a79 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/14/13 21:15:10)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/14/13 21:17:17)

Message:

Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

• commit '797f2a791397210ec1b591b326658805c5dbf104': hdsenc: Check the init_file() return code hdsenc: Fix an off by one error in an array size check hdsenc: Avoid integer overflow

Conflicts:

libavformat/hdsenc.c

See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)