diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:38:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:38:27 +0200 |
| commit | 4a522eff006532f28c631f13a604c364102b7a6f (patch) | |
| tree | 2c3f6f2f03019c7737273d551811b0c40bd04367 /libavformat/Makefile | |
| parent | 301522f521f05c998fb8dfba153d49e557604507 (diff) | |
| parent | afc8685395e775fe0f2a1698b683aea4afd124af (diff) | |
| download | ffmpeg-4a522eff006532f28c631f13a604c364102b7a6f.tar.gz | |
Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'
* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
avf: split off format register and lookup function
Conflicts:
libavformat/utils.c
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 5438b483d3..b1f70d3786 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -11,6 +11,7 @@ OBJS = allformats.o \ avio.o \ aviobuf.o \ cutils.o \ + format.o \ id3v1.o \ id3v2.o \ metadata.o \ |