diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:30:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:30:51 +0100 |
| commit | cf95877474ad8add55126db746f6818b47f71f37 (patch) | |
| tree | 266b74145fbdcc18260b68f87124a0a9bf133c1d /libavformat/Makefile | |
| parent | 17773f49b7da49ceecc4b6260d5ded6938f9b163 (diff) | |
| parent | c82bf15dca00f67a701d126e47ea9075fc9459cb (diff) | |
| download | ffmpeg-cf95877474ad8add55126db746f6818b47f71f37.tar.gz | |
Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'
* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
rtpenc: Merge the h264 and hevc packetizers
Conflicts:
libavformat/rtpenc_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 4cc300f4fb..79df1c5471 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -376,11 +376,10 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_h261.o \ rtpenc_h263.o \ rtpenc_h263_rfc2190.o \ - rtpenc_hevc.o \ + rtpenc_h264_hevc.o \ rtpenc_jpeg.o \ rtpenc_mpv.o \ rtpenc.o \ - rtpenc_h264.o \ rtpenc_vp8.o \ rtpenc_xiph.o \ avc.o hevc.o |