aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-25 00:25:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-25 00:25:12 +0100
commitfa80b76b110c663809671f7254bc07513710c061 (patch)
tree8e5de25c31794db57407a8367a84f7207342631b /MAINTAINERS
parent64f58d20b2008bd2c633beef3c21331dfff0d0e5 (diff)
parentbb4a310bb85f43e62240145a656b1e5285b14239 (diff)
downloadffmpeg-fa80b76b110c663809671f7254bc07513710c061.tar.gz
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>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions