Changeset e28130bc in ffmpeg

Timestamp:

Nov 15, 2013, 11:52:19 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

91e00c4a

Parents:

3e78cead (diff), 3cbe1126 (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> (11/15/13 11:32:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/15/13 11:52:19)

Message:

Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'

• commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header

Conflicts:

libavcodec/dvdata.h

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

(No files)