ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Mar 2
21:52:57 2015 +0100| [bf691e1d39560532344e6df2e72f522cea6c9bea] | committer:
Michael Niedermayer
Merge commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c'
* commit '33d412eb4a2a083c1514ddbe69295b37e1918a8c':
dashenc: Simplify code by using a local variable
Conflicts:
libavformat/dashenc.c
See: b86af8da3100a7eef3247747cd469b988f134e0d
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf691e1d39560532344e6df2e72f522cea6c9bea
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
