OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:58:41 +0000 (16:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:58:41 +0000 (16:58 +0100)
commit946cbf04ee95d800526f591ae194378fdec91150
tree0e24ae75607f21315387028444eb50fbef601126
parentafb3fb335265a443aac83883606fa4274b4330b7
parent4750b05d67fd87263cb767b896e1cf55713a39de
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>
libavfilter/af_join.c