Changeset db4a2976 in ffmpeg

Timestamp:

Feb 22, 2015, 10:54:34 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

17c52d74

Parents:

0a32a1b4 (diff), c99915f7 (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> (02/22/15 22:54:11)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/22/15 22:54:34)

Message:

Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'

• commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7': rtpdec: DV depacketizer (RFC 6469)

Conflicts:

Changelog
libavformat/Makefile
libavformat/rtpdec_dv.c
libavformat/version.h

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

(No files)