Commit bf691e1d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '33d412eb'

* commit '33d412eb':
  dashenc: Simplify code by using a local variable

Conflicts:
	libavformat/dashenc.c

See: b86af8daMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6cfd5366 33d412eb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment