diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 21:33:51 +0100 |
| commit | 7a6034805305cb5d6a3d755d774f0ad09119049e (patch) | |
| tree | 7062d51b46c39f95dec61723b03f40158285c11b /libavutil/Makefile | |
| parent | 64f73acd1d3853e55a7cd7631987dfd83c4171e7 (diff) | |
| parent | 7e244c68600f479270e979258e389ed5240885fb (diff) | |
| download | ffmpeg-7a6034805305cb5d6a3d755d774f0ad09119049e.tar.gz | |
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index 5e0c4aebe4..89708fc0af 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -47,6 +47,7 @@ HEADERS = adler32.h \ samplefmt.h \ sha.h \ sha512.h \ + stereo3d.h \ time.h \ timecode.h \ timestamp.h \ @@ -110,6 +111,7 @@ OBJS = adler32.o \ samplefmt.o \ sha.o \ sha512.o \ + stereo3d.o \ time.o \ timecode.o \ tree.o \ |