[FFmpeg-cvslog] Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  7 23:04:11 2014 +0200| [75be508f7c6ed946170eab3323f6749f84dbb8b8] | committer: Michael Niedermayer

Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'

* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

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

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