[FFmpeg-cvslog] Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'

Michael Niedermayer git at videolan.org
Fri Nov 22 18:07:55 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 17:48:45 2013 +0100| [15b2ec57ccaee49e8ec6de93d0ad7055da282e4d] | committer: Michael Niedermayer

Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'

* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
	libavformat/http.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15b2ec57ccaee49e8ec6de93d0ad7055da282e4d
---





More information about the ffmpeg-cvslog mailing list