[FFmpeg-cvslog] Merge remote-tracking branch 'cigaes/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 21 23:50:04 2013 +0200| [23c06984995e69d1cdc9ef1d610d6942e970dec6] | committer: Michael Niedermayer

Merge remote-tracking branch 'cigaes/master'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23c06984995e69d1cdc9ef1d610d6942e970dec6
---