aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-16 16:58:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-16 16:58:41 +0100
commit946cbf04ee95d800526f591ae194378fdec91150 (patch)
tree0e24ae75607f21315387028444eb50fbef601126 /libavcodec
parentafb3fb335265a443aac83883606fa4274b4330b7 (diff)
parent4750b05d67fd87263cb767b896e1cf55713a39de (diff)
downloadffmpeg-946cbf04ee95d800526f591ae194378fdec91150.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: af_join: do not leak input frames. asrc_anullsrc: return EOF, not -1 Conflicts: libavfilter/asrc_anullsrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions