Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 20:29:10 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 20:29:47 +0000 (22:29 +0200)
commit5afe1233c591d661543d89b8bde613bf8bae75b0
tree7e7acd44df147b76296d96ed20758beff84dbdbd
parent941aaa39e8cd78ba4d16dfcec767290aec9a0136
parent8bef43388132b53f59a6e90add18900a3bb4cc60
Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'

* commit '8bef43388132b53f59a6e90add18900a3bb4cc60':
  smoothstreamingenc: Simplify code by removing a redundant variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/smoothstreamingenc.c