diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-04 14:23:22 +0100 |
| commit | dacd6202ec50d122fcb7e9e92cdd014444cd2a98 (patch) | |
| tree | 0c9ceb86ced0b85eb1b1eccfc7346060b69a2b37 /libavformat/Makefile | |
| parent | 765debf51f1aee58b6748e575082ecd30033b323 (diff) | |
| parent | 1944d532a8a1c4b12222f0acfeb1153630dbc996 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: always use pic for shared libraries
build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
fate: ea, h264: prettyprinting and ordering cosmetics
Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 088699666a..de1a05ba48 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -25,6 +25,25 @@ OBJS = allformats.o \ utils.o \ OBJS-$(CONFIG_NETWORK) += network.o +OBJS-$(CONFIG_RTPDEC) += rdt.o \ + rtp.o \ + rtpdec.o \ + rtpdec_amr.o \ + rtpdec_asf.o \ + rtpdec_g726.o \ + rtpdec_h263.o \ + rtpdec_h263_rfc2190.o \ + rtpdec_h264.o \ + rtpdec_ilbc.o \ + rtpdec_jpeg.o \ + rtpdec_latm.o \ + rtpdec_mpeg4.o \ + rtpdec_qcelp.o \ + rtpdec_qdm2.o \ + rtpdec_qt.o \ + rtpdec_svq3.o \ + rtpdec_vp8.o \ + rtpdec_xiph.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o @@ -293,25 +312,6 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ rtpenc_vp8.o \ rtpenc_xiph.o \ avc.o -OBJS-$(CONFIG_RTPDEC) += rdt.o \ - rtp.o \ - rtpdec.o \ - rtpdec_amr.o \ - rtpdec_asf.o \ - rtpdec_g726.o \ - rtpdec_h263.o \ - rtpdec_h263_rfc2190.o \ - rtpdec_h264.o \ - rtpdec_ilbc.o \ - rtpdec_jpeg.o \ - rtpdec_latm.o \ - rtpdec_mpeg4.o \ - rtpdec_qcelp.o \ - rtpdec_qdm2.o \ - rtpdec_qt.o \ - rtpdec_svq3.o \ - rtpdec_vp8.o \ - rtpdec_xiph.o OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ urldecode.o OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ |