summaryrefslogtreecommitdiffstats
path: root/libmpdemux/muxer_lavf.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove MEncoderUoti Urpala2010-11-021-408/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MEncoder compilation and remove files used by MEncoder only. There's no attempt to remove all references to MEncoder from the build system, documentation etc at this point. Removed files: (muxers, audio/video encoders, misc) mencoder.c cfg-mencoder.h parser-mecmd.[ch] xvid_vbr.[ch] libmpdemux/muxer* libmpcodecs/ae* libmpcodecs/ve* libmpcodecs/native/rtjpegn.[ch] libmpcodecs/native/mmx.h // was used by rtjpegn only Rationale: MEncoder is still useful for some people, but there's not much potential for further development; in the long run almost all use cases can be handled better by solutions based on something else (for example using FFmpeg or encoding MPlayer output). FFmpeg is already getting video filtering support which should work for some common MEncoder uses. Keeping MEncoder working takes extra work that is away from player development. While that amount of work is not huge (mostly MEncoder can be just ignored), it's not completely insignificant either. MEncoder is still maintained to some degree in the svn tree, so if necessary it's possible to use it from there for now. This tree has never had major improvements for the MEncoder side, so using svn MEncoder instead should be no major loss.
* Merge svn changes up to r31004Uoti Urpala2010-04-261-1/+1
|\
| * Mark muxer-related m_option_t arrays as const.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30748Uoti Urpala2010-03-101-1/+1
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-1/+1
| | | | | | | | | | | | | | | | These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-1/+1
|\|
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-221-1/+1
| | | | | | | | | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-24/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Use own mp_*_taglists code instead of libavformat internalsUoti Urpala2009-07-261-2/+2
| | | | | | | | | | Use the version of code under ffmpeg_files/ instead of relying on libavformat source files to be available.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-24/+24
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+18
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-2/+2
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-2/+2
|/ | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* fix compilation w/ FFmpeg r15533gpoirier2008-10-031-1/+1
| | | | | | | patch by Andrew Wason %rectalogic A rectalogic P com% git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27688 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use av_alloc_put_byte instead of custom protocol.reimar2008-05-211-48/+11
| | | | | | | This needs less code and less hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26848 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: wording/spelling fixesdiego2008-05-111-18/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26734 b3059339-0415-0410-9bf9-f77b7e298cf2
* AVOptions support for lavf muxing.michael2008-05-101-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace a really ugly hack by a clean but not thread safe solution.michael2008-05-101-2/+7
| | | | | | | | (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
* Remove unnecessary version.h #includes.diego2008-04-301-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split the lavf taglists out of the lavf muxer to allow using libmpmuxalbeu2008-04-091-3/+2
| | | | | | | without libmpdemux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-5/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bring (de)muxer_lavf up to date with the libavformat API changes introduced ↵iive2007-11-231-2/+2
| | | | | | | | | | | 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
* Fix compilation error.iive2007-11-221-1/+1
| | | | | | | | | 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
* Fix typo in error messagereimar2007-11-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24976 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing pixelformat conversion function prototypereimar2007-08-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24144 b3059339-0415-0410-9bf9-f77b7e298cf2
* get rid of this idiotic i_certify_that_my_video_stream_does_not_use_b_framesmichael2007-07-311-14/+1
| | | | | | | | | 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
* make muxer store the provided timestampsmichael2007-07-311-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23975 b3059339-0415-0410-9bf9-f77b7e298cf2
* pstrcpy -> av_strlcpyreimar2007-06-241-7/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23622 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: fix indentation for previous commitcorey2007-05-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23339 b3059339-0415-0410-9bf9-f77b7e298cf2
* PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, ctx->pix_fmt getscorey2007-05-181-0/+1
| | | | | | | set incorrectly to PIX_FMT_YUV420P git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23338 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).corey2007-05-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't segfault if no -format is given for lavfuau2007-02-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print list of lavf muxer formats with format=help.reimar2007-02-141-2/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22216 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify by using av_codec_get_id and include riff.h only in demux_lavf.creimar2007-01-211-6/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after lavf changesreimar2007-01-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
* support -ffourcc with -of lavfreimar2007-01-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Include "internal" libavformat/riff.h also when dynamic libavformat is usedreimar2007-01-061-10/+1
| | | | | | | | 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
* Include libavformat/riff.h when building with static libavformat andreimar2007-01-061-4/+11
| | | | | | | add and correct prototypes if not. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
* sizeof() is long, thus %d format in error message is wrong.reimar2007-01-051-5/+6
| | | | | | | | 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
* first step toward amr-nb muxing supportmichael2006-12-291-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-181-3/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* fprintf -> mp_msgmichael2006-11-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20756 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass average bitrate from encoder to (lavf) muxermichael2006-08-101-1/+2
| | | | | | | 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
* Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle.diego2006-07-131-18/+1
| | | | | | | It served no apparent purpose anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19078 b3059339-0415-0410-9bf9-f77b7e298cf2
* metadata supportmichael2006-05-301-1/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18555 b3059339-0415-0410-9bf9-f77b7e298cf2
* recommitted version 1.22 + Rich's 1.25nicodvb2006-03-131-9/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17847 b3059339-0415-0410-9bf9-f77b7e298cf2
* in fix_parameters() move assignment of audio bitrate to the proper block ↵nicodvb2006-03-121-3/+2
| | | | | | (the bitrate for video is actually hardcoded to 800000) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17835 b3059339-0415-0410-9bf9-f77b7e298cf2
* check stream->wf and stream->bih before using them in fix_parameters(). ↵nicodvb2006-03-121-0/+4
| | | | | | Fixes cid 43 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17834 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix cosmetics noticed during nico's 10lrfelker2006-03-121-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17831 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed C99-ism introduced with previous commitnicodvb2006-03-121-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17830 b3059339-0415-0410-9bf9-f77b7e298cf2
* check muxer != NULL before using it; closes cid 201nicodvb2006-03-121-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17829 b3059339-0415-0410-9bf9-f77b7e298cf2
* change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to ↵michael2006-01-261-1/+1
| | | | | | muxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
* limits.h for INT_MAXmichael2006-01-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17486 b3059339-0415-0410-9bf9-f77b7e298cf2
* correct block alignmichael2006-01-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17485 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix aac in mov/mp4michael2006-01-251-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17483 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass vbv_size & max_rate from encoder to muxer over muxer_stream_t (if this ↵michael2006-01-251-2/+19
| | | | | | | | | | 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
* setting codec_tag unconditionally to FMP4 is a bad idea (breaks mov/mp4)michael2006-01-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17480 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for external libavformatnicodvb2006-01-091-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxer_lavf MUST be disabled by default until someone adds AVParserrfelker2005-12-021-0/+20
| | | | | | | | | | | | 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
* Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT ↵reynaldo2005-11-291-2/+3
| | | | | | -fatooh/org- , small fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17066 b3059339-0415-0410-9bf9-f77b7e298cf2
* buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh ↵nicodvb2005-11-211-8/+1
| | | | | | punctum org) plus small fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use PRI?64 defines as format strings for 64 bit variables.reimar2005-10-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
* video fourcc fixmichael2005-08-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16201 b3059339-0415-0410-9bf9-f77b7e298cf2
* LIBAVFORMAT_BUILD >= 4629michael2005-07-181-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16002 b3059339-0415-0410-9bf9-f77b7e298cf2
* mux extradata</