diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:05:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 00:09:31 +0200 |
| commit | 1f87cbe8349d8662c0d6ead40cc39620b01ae0da (patch) | |
| tree | b986665a569a53b76cbc86263d1ba1a4645c8d01 /libavformat/Makefile | |
| parent | 8097307bfb6a90d18d35a870ff61016111820ab7 (diff) | |
| parent | df9f22d42b0905385629a9d368bb5a1eef2b45ef (diff) | |
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>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index b1f70d3786..c151f1346e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -21,6 +21,7 @@ OBJS = allformats.o \ riff.o \ sdp.o \ seek.o \ + url.o \ utils.o \ OBJS-$(CONFIG_NETWORK) += network.o |