Changeset 4c63beee in ffmpeg

Timestamp:

Mar 10, 2014, 10:51:40 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

27b4d154

Parents:

53eb4e07 (diff), 8cafeb8b (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 '8cafeb8bca5d079041739dbd72ccec0ead138eaf'

• commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf': mxfdec: Validate parameters to strftime

Conflicts:

libavformat/mxfdec.c

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

(No files)