Changeset 20f5a179 in ffmpeg

Timestamp:

Feb 22, 2015, 12:59:44 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

27216bf3

Parents:

abf357a9 (diff), 44dc138e (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:58:55)

git-committer:

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

Message:

Merge commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4'

• commit '44dc138ed29c4dfbaf57ebc774da4c75ef113ca4': rtpdec_mpeg4: reassemble fragmented AAC frames

Conflicts:

libavformat/rtpdec_mpeg4.c

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

(No files)