diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 12:24:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 12:48:03 +0200 |
| commit | 83d100baea7ae9549ac189772a62d83dc6bc48e4 (patch) | |
| tree | 0b1fb04e46290ea94fd84ed5f2dddd67dc4803ff /libavformat/Makefile | |
| parent | 593dc5aed907594753862828a461f58b5d48a0e0 (diff) | |
| parent | 2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb (diff) | |
| download | ffmpeg-streaming-83d100baea7ae9549ac189772a62d83dc6bc48e4.zip ffmpeg-streaming-83d100baea7ae9549ac189772a62d83dc6bc48e4.tar.gz | |
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'
* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
lavf: group dump functions together
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 7b7156c..b429b43 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -10,6 +10,7 @@ OBJS = allformats.o \ avio.o \ aviobuf.o \ cutils.o \ + dump.o \ format.o \ id3v1.o \ id3v2.o \ |
