Michael Niedermayer 1f87cbe834 Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef' ...

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

Conflicts:
	libavformat/internal.h

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

2013-06-17 00:09:31 +02:00

1.9 KiB

Raw Blame History

View Raw