diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:00:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:02:01 +0100 |
| commit | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (patch) | |
| tree | f20d33699f6f79a2daaaaa2513bb7fcc0f396a7e /libavformat/Makefile | |
| parent | 950482bf587889c507340ae5893a851be8e99fcc (diff) | |
| parent | c6f1dc8e4cd967ae056698eafb891a08003c211c (diff) | |
| download | ffmpeg-streaming-0a5da9cc148b2ac7102b4a0653c38735672629f6.zip ffmpeg-streaming-0a5da9cc148b2ac7102b4a0653c38735672629f6.tar.gz | |
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
rtpdec: Move setting the parsing flags to the actual depacketizers
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Conflicts:
libavformat/rtpdec.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 7d9f1d7..ae20430 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -37,6 +37,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_ilbc.o \ rtpdec_jpeg.o \ rtpdec_latm.o \ + rtpdec_mpeg12.o \ rtpdec_mpeg4.o \ rtpdec_mpegts.o \ rtpdec_qcelp.o \ |
