ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Feb 11
01:43:00 2015 +0100| [702cf8d0de9e31c0bc62b6a671dfc54411b22fd6] | committer:
Michael Niedermayer
Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'
* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
lavf: remove unused code
Conflicts:
libavformat/seek.c
libavformat/seek.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=702cf8d0de9e31c0bc62b6a671dfc54411b22fd6
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
