Commit Graph

28 Commits

Author SHA1 Message Date
diego 21c200e767 FFmpeg now uses different (unified) #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
diego 835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
ulion 1ed6e96cfb Fix all current known multi-channel wrong order problems by adding
common functions for channel reordering.
This fixes these modules by adding channel reordering code for 5.0/5.1 audio:
ao: pcm
ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm
ae: faac, lavc(ac3, libfaac), pcm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 16:53:30 +00:00
diego 7bfa03ac43 warning fix:
libmpcodecs/ae_lavc.c:135: warning: 'lavc_find_atag' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24379 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:57:36 +00:00
michael 2fe0411b9a allow to specify the audio bitrate in bits (some codecs need that ...)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23977 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:51:39 +00:00
diego 05c7a055e8 Simplify preprocessor directives: There is a general variable for
static/shared FFmpeg libraries now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 15:10:07 +00:00
diego 20d778b3fa Add explicit location for headers from the libmpdemux/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:51:32 +00:00
diego 6b14d50848 Add explicit location for headers from the stream/ directory.
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 17:30:55 +00:00
diego 4f452096c0 cosmetics: Fix some common typos, appropiate --> appropRiate,
handEling --> handling, dependAnt --> dependEnt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22334 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 10:27:14 +00:00
reimar 4b9ddc69a0 Simplify by using av_codec_get_id and include riff.h only in demux_lavf.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 15:44:58 +00:00
reimar 63b14952d2 Another AVCodecTag compile fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21981 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:49:08 +00:00
nicodvb bb9bd19bc8 include the right riff.h according to USE_LIBAVFORMAT_SO|USE_LIBAVFORMAT; please stop breaking code that uses *_SO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21962 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-19 01:19:02 +00:00
reimar 0c8d9ba25f Include "internal" libavformat/riff.h also when dynamic libavformat is used
instead of duplicating typedefs and function prototypes in already three
different places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 17:28:11 +00:00
reimar a52c97540c Include libavformat/riff.h when building with static libavformat and
add and correct prototypes if not.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 14:40:05 +00:00
michael 6f0e3fb15d the avi spec does not allow random samplesize whoever wrote this should be shot
also block align should be equal to sample size
i dunno if this breaks anything but the old code was definitly not correct
this also fixes amr_nb muxing (in .3gp with lavf for example)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21789 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 20:40:19 +00:00
michael 8f7f2ad9e0 first step toward amr-nb muxing support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-29 18:56:28 +00:00
nicodvb cf099b2100 muxers now write to output muxer->stream rather than to muxer->file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-18 21:03:59 +00:00
michael b85ad74dc9 pass average bitrate from encoder to (lavf) muxer
this fixes some problems with muxing mp4 files for the psp


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19366 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-10 21:48:41 +00:00
michael 4f3dfe9738 do not randomly chop up packets, this isnt allowed in almost no container
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17856 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 17:15:51 +00:00
michael 3d19a5474d -lavcopts aglobal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17843 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 02:40:09 +00:00
nicodvb ad978de549 added support for external libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-09 19:35:44 +00:00
rathann cb116e1b6e fix
ae_lavc.c:168: warning: implicit declaration of function 'codec_get_wav_tag'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17097 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-05 01:30:31 +00:00
diego 36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
nicodvb 08e085ad3f wrong memcpy of extradata; 10l to whomever wrote that broken code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15502 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-17 21:49:48 +00:00
nicodvb 1442d50c9b restore old lavc_find_atag to be used when compiling mplayer without libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15245 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 23:57:43 +00:00
nicodvb 7b937b3717 macosx compilation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15241 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 17:53:31 +00:00
nexus 79b6ff0976 FreeBSD fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15239 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 13:53:56 +00:00
nicodvb 3faa5ea6fd audio encoding reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-22 06:59:59 +00:00