Changeset abf357a9 in ffmpeg

Timestamp:

Feb 22, 2015, 12:49:37 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

20f5a179

Parents:

1186e7c (diff), dcf969e9 (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 00:48:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/22/15 00:49:37)

Message:

Merge commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3'

• commit 'dcf969e98d3f596006a0ddaf077870408b9c09c3': rtpdec_mpeg4: add more verbose error logging

Conflicts:

libavformat/rtpdec_mpeg4.c

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

(No files)