6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
f077569dff
Add standard license header to all files in libmpdemux.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
bf0e018a68
fix compilation w/ FFmpeg r15533
...
patch by Andrew Wason %rectalogic A rectalogic P com%
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-03 14:54:22 +00:00
2bdedd33ed
Use av_alloc_put_byte instead of custom protocol.
...
This needs less code and less hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26848 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 18:21:05 +00:00
f1579b88c9
cosmetics: wording/spelling fixes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26734 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 12:03:26 +00:00
2ce3df53b1
AVOptions support for lavf muxing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:22:41 +00:00
13b723459b
Replace a really ugly hack by a clean but not thread safe solution.
...
(no threads so no problem anyway ...)
This fixes the segfault with lavf muxing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26722 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 17:19:18 +00:00
7d560418f6
Remove unnecessary version.h #includes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 11:03:41 +00:00
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
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
958c41d9b6
Bring (de)muxer_lavf up to date with the libavformat API changes introduced by FFmpeg commit r11071.
...
Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo
Patch for muxer_lavf.c by me.
Approved by michaelni.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 10:44:33 +00:00
07c7b70714
Fix compilation error.
...
FFmpeg commit r11071 removed the static ByteIOContext from AVFormatContext
and replaced it with a dynamic one.
Thus muxer_lavf.c needs to be modified to reflect the change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25135 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-22 00:22:29 +00:00
5b7c961784
Fix typo in error message
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24976 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-06 08:12:19 +00:00
01d92a32ad
cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
4e19d8fe2f
Add missing pixelformat conversion function prototype
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24144 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-24 20:59:55 +00:00
fad572fc72
get rid of this idiotic i_certify_that_my_video_stream_does_not_use_b_frames
...
muxer_lavf can now generate correct files with b frames as long as the timestamps
provided to it are correct (they should be with lavc encoding, expect trouble with
stream copy though)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23976 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:28:47 +00:00
8067c7b5ca
make muxer store the provided timestamps
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23975 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-31 17:24:53 +00:00
b88ce7fe9d
pstrcpy -> av_strlcpy
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23622 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 08:39:40 +00:00
f7c7e60349
cosmetics: fix indentation for previous commit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23339 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-18 02:10:41 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
diego
gpoirier
reimar
michael
albeu
iive
corey
uau
nicodvb
rfelker