Changeset fa80b76b in ffmpeg

Timestamp:

Feb 24, 2015, 11:25:12 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

79052cd4

Parents:

64f58d20 (diff), bb4a310b (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.

Message:

Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'

• commit 'bb4a310bb85f43e62240145a656b1e5285b14239': rtpdec: Don't free the payload context in the .free function

Conflicts:

libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c

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

(No files)