Merge commit '33d412eb'
* commit '33d412eb': dashenc: Simplify code by using a local variable Conflicts: libavformat/dashenc.c See: b86af8daMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '33d412eb': dashenc: Simplify code by using a local variable Conflicts: libavformat/dashenc.c See: b86af8daMerged-by:Michael Niedermayer <michaelni@gmx.at>