diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 21:04:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-09 21:40:09 +0100 |
| commit | 6ef9d1b21629f005c319dfb2010154fa8e540f73 (patch) | |
| tree | 9450ae12c310cfbbc407a07d4eaf336e6d20383b /libavformat/Makefile | |
| parent | 2d0117f816b92510546caf26414961ee6088f961 (diff) | |
| parent | fccfc22d1f304aef42a0b960e4c1d55ce67107f5 (diff) | |
| download | ffmpeg-6ef9d1b21629f005c319dfb2010154fa8e540f73.tar.gz | |
Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'
* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
libavformat: Build hevc.o when building the RTP muxer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f0900c4343..6bf0761b21 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -377,7 +377,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_h264.o \ rtpenc_vp8.o \ rtpenc_xiph.o \ - avc.o + avc.o hevc.o OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ urldecode.o OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ |