Changeset 7d9b06eb in ffmpeg

Timestamp:

Feb 24, 2015, 11:42:14 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7f03f75c

Parents:

6e9bbaca (diff), 199fb402 (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/24/15 23:40:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/24/15 23:42:14)

Message:

Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'

• commit '199fb40278146c5bb162990c66ad3cd561abc780': rtpdec: Use ffio_free_dyn_buf

Conflicts:

libavformat/rtpdec_latm.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c

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

(No files)