Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 20:04:49 +0000 (21:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 20:40:09 +0000 (21:40 +0100)
* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile

index f0900c4..6bf0761 100644 (file)
@@ -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 \