[FFmpeg-cvslog] Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 17 00:05:02 2013 +0200| [1f87cbe8349d8662c0d6ead40cc39620b01ae0da] | committer: Michael Niedermayer

Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'

* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
	libavformat/internal.h

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

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