Merge commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:09:16 +0000 (21:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Jan 2015 20:09:20 +0000 (21:09 +0100)
commit9cbaf5849b217342b9850bd39e91d3c83f8f2ed1
treeb13257d21b878d8ec2e02aac285c7b344586b37b
parentf191c98e4d557edb23f6d1f119d96ce1cd70ebca
parentea3fc9fe68752eb1b9078b28bea18a1e781d1c2c
Merge commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c'

* commit 'ea3fc9fe68752eb1b9078b28bea18a1e781d1c2c':
  smoothstreamingenc: Add a missing "goto fail"

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