Changeset 00ebf89d in ffmpeg

Timestamp:

Jun 12, 2015, 8:55:49 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fd04082a

Parents:

e1ec9c7f (diff), a7ac1a7b (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 'a7ac1a7b94447f33ae95be4d6d186e2775977f91'

• commit 'a7ac1a7b94447f33ae95be4d6d186e2775977f91': flv: Name an enum and use its type

Conflicts:

libavformat/flvdec.c

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

(No files)