Commit Graph

159 Commits

Author SHA1 Message Date
albeu 698142597e Split the lavf taglists out of the lavf muxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:46:21 +00:00
albeu 0359e6ddfb Split the aac header parsing out of aac demuxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:43:19 +00:00
diego f653e52663 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:37:41 +00:00
lu_zero 0ff4b3fd9f libnemesi support, yet another rtsp/rtp library...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-19 21:38:22 +00:00
diego 49b64742ed Add general variables for either static or shared FFmpeg libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23119 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 11:22:22 +00:00
diego 61a6e06a52 Add CXX include flags to dependency file generation CFLAGS to generate correct
dependencies for C++ source files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23116 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 10:36:59 +00:00
diego 5a8c8aadef cosmetics: Remove CONFIG_ prefix from FFmpeg library Makefile variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23110 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 08:35:35 +00:00
diego 5f6965df5d Move libav* include CFLAGS to mpcommon.mak instead of duplicating them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22735 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-18 22:49:37 +00:00
diego 132dd09be9 Move setting CXXFLAGS to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22731 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-18 21:58:28 +00:00
diego a6eca2eef8 Use explicit path for headers from the loader/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 22:34:45 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
diego 8868c13dc7 Add live555 include flags to CXXFLAGS only.
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22621 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:07:12 +00:00
diego 5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +00:00
diego 60b39e2786 Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 12:10:57 +00:00
diego 4eebe7dc88 Revert libnut option names, the issue is fixed in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22208 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-12 09:51:25 +00:00
gpoirier 860dd21ab1 Fix libnut build failure.
Use CONFIG_LIBNUT like ffmpeg's configure, instead of LIBNUT.
Patch by Clemens Ladisch % cladisch A fastmail P net %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22169 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-07 09:00:11 +00:00
diego 2e66db0c4a Discard -Wdeclaration-after-statement warning.
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21992 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 23:21:50 +00:00
aurel 016b1cb9e5 don't compile demux_mpc.c when libmpcdec is disabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 23:44:38 +00:00
diego c00059b047 Remove suffix rules that are just copies of make builtin rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:08:25 +00:00
diego 44e2adf8d3 Use standard name for C++ flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 11:41:58 +00:00
diego b125a9e129 Add libav include paths to CFLAGS without indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
diego b7b22bd874 Remove some superfluous include CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:14:03 +00:00
diego 31844ae22d cosmetics: Sort SRCS by alphabetical order.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21353 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 11:53:08 +00:00
diego 02436df5fc Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
diego f415c639b9 Move common code to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:32:24 +00:00
diego 42bf94ecc7 10l: Muxers were not being compiled even when MEncoder was enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:36:13 +00:00
diego a46183fb2c FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:37:03 +00:00
diego dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
diego c95db8d583 Simplify, remove useless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:04:14 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
diego d52d16f96e Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
ods15 1b8971d82e Add demux_nut to MPlayer repo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
diego 368bf2263b Remove XMMS_CFLAGS from CFLAGS, the variable is never set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19558 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 20:17:19 +00:00
diego ebacc18087 demux_avs compilation should depend on WIN32DLL support, not a linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 23:18:58 +00:00
diego b02e7924b9 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
diego ab02002f0d Forgotten part of the LIVE555 configure test simplification.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 22:18:21 +00:00
ben e503389acf mf.[hc] belong to libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19306 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 19:31:36 +00:00
ben 8f8547ae86 removed deprecated test.c file from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19282 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 20:32:38 +00:00
ben 49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
diego 22b5b6d0f5 Unify include paths in the build system, part I.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19195 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 10:08:17 +00:00
diego 51a2db3628 Introduce general V4L variable/define.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19194 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 09:34:32 +00:00
diego a881f35f1a Rename *v4l variable to *v4l1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19192 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 09:30:39 +00:00
ben 856401960f rename rtsp.c to stream_rtsp.c for consistency with other input modules
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19160 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-22 14:40:14 +00:00
ben b1b0d86c7e moved mpeg_packetizer helpers to libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-19 22:13:50 +00:00
diego 742e7da887 Remove non-existing CSS_INC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19055 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 23:51:41 +00:00
diego f7d4dd174b OPTFLAGS already includes EXTRA_INC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19042 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-12 17:58:07 +00:00
ben 60aa2f1a39 added new pvr:// input for ivtv based cards
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19002 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-10 21:32:19 +00:00
reimar 310a0bc819 Fix for case when both V4L and V4L2 are enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18929 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 20:49:23 +00:00
diego 7844cbc3ce Move conditional compilation into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18927 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 13:09:45 +00:00