Commit Graph

46 Commits

Author SHA1 Message Date
corey d26e1dd55f PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, ctx->pix_fmt gets
set incorrectly to PIX_FMT_YUV420P


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23338 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-18 02:09:26 +00:00
corey f58a3d0fda Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-17 00:16:51 +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
uau 6a1bc9678e Don't segfault if no -format is given for lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-16 23:09:13 +00:00
reimar 807a81cf69 Print list of lavf muxer formats with format=help.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22216 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-14 11:06:59 +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 abb0510502 Fix compilation after lavf changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:17:40 +00:00
reimar cb47a72a44 support -ffourcc with -of lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-21 10:10:07 +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
reimar e3fe6113a6 sizeof() is long, thus %d format in error message is wrong.
Fix by assigning extradata_size before and printing that, since
this also removes a bit of code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:41:00 +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
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
michael 1052ab502a fprintf -> mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20756 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 19:05:38 +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
diego b5de6c39e6 Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.
It served no apparent purpose anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19078 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 23:02:03 +00:00
michael 4729952a40 metadata support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18555 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-30 23:23:28 +00:00
nicodvb 619973d7b1 recommitted version 1.22 + Rich's 1.25
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17847 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 07:08:01 +00:00
nicodvb d4df0074af in fix_parameters() move assignment of audio bitrate to the proper block (the bitrate for video is actually hardcoded to 800000)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17835 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 19:05:57 +00:00
nicodvb f7cdaa9cba check stream->wf and stream->bih before using them in fix_parameters(). Fixes cid 43
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17834 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 18:58:08 +00:00
rfelker 8f872aaeda fix cosmetics noticed during nico's 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17831 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 18:11:32 +00:00
nicodvb 661225715a fixed C99-ism introduced with previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17830 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 18:06:46 +00:00
nicodvb 21fda01ab7 check muxer != NULL before using it; closes cid 201
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17829 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-12 17:46:51 +00:00
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-26 19:32:07 +00:00
michael fe4aee5d94 limits.h for INT_MAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17486 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-25 20:55:47 +00:00
michael 2278fb117f correct block align
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-25 19:30:01 +00:00
michael c88173f78a fix aac in mov/mp4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-25 15:49:31 +00:00
michael 590e8e7153 pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this is wrong/silly/10000000l then dont hesitate to flame / reverse)
make a few things like mux_rate, mux_max_delay, ... user settable
fixed buffer underflow errors when muxing to mpeg-ps


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17481 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-25 01:17:57 +00:00
michael 510f186eff setting codec_tag unconditionally to FMP4 is a bad idea (breaks mov/mp4)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17480 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-24 23:55:43 +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
rfelker c4f58eee9e muxer_lavf MUST be disabled by default until someone adds AVParser
support to it. Otherwise users will generate files with totally
nonsensical pts if they use B frames! (And they are already doing so
-- see mplayer-users list!)

If anyone wants to volunteer to add AVParser support, go right ahead!
But until then, do not remove this check. :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17080 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-02 19:43:36 +00:00
reynaldo 2ae5a0788d Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-29 22:04:57 +00:00
nicodvb 7a8f8317fd buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-21 22:53:14 +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
reimar 169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
michael 0589ba3055 video fourcc fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16201 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-11 20:54:09 +00:00
michael 57b7f68b80 LIBAVFORMAT_BUILD >= 4629
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16002 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-18 00:10:09 +00:00
nicodvb 34ad64a0ed mux extradata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15501 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-17 21:44:28 +00:00
michael b7b46136ce fix timestamps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15315 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 11:13:14 +00:00
rfelker 64c03e2f89 at lest this fixes build.. there's no way muxer_lavf is working right yet tho with mencoder's broken timestamps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15310 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 05:11:02 +00:00
nicodvb 1e12bf4d71 added missing initializer in URLProtocolo; mux packets only if len > 0; second mencoder's a/v sync model
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15199 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-17 09:13:48 +00:00
rathann e3b183dc3f - fix gcc warnings, strlcat/strlcpy prototypes
- fix bad sscanf usage in geometry.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15059 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-06 11:57:10 +00:00
michael 7beeedc331 various (de)muxer_lavf fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15012 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-25 22:47:09 +00:00
michael c9a5ffcee7 1000l (dwSampleSize != nSamplesPerSec)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15006 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-25 02:41:08 +00:00
nicodvb aa566ac6de initial, extremely experimental, libavformat muxer; don't expect anything to work yet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14758 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-21 23:18:31 +00:00