Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Oct 2013 21:50:04 +0000 (23:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Oct 2013 21:50:07 +0000 (23:50 +0200)
* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.

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

Trivial merge