Changeset 89e705cd in ffmpeg

Timestamp:

Nov 15, 2014, 6:11:14 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dcb10ef9

Parents:

a2f05d33 (diff), 74d7db58 (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/14 18:09:30)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/15/14 18:11:14)

Message:

Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c'

• commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c': dv: Drop a spurious check

Conflicts:

libavcodec/dvdec.c

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

(No files)