summaryrefslogtreecommitdiffstats
path: root/libmpdemux/muxer_mpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove MEncoderUoti Urpala2010-11-021-2735/+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 r31169Uoti Urpala2010-05-301-1/+4
|\
| * Remove internal liba52 copy.diego2010-05-091-2/+0
| | | | | | | | | | | | | | Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the system liba52 headers when internal liba52 is disabled, fixes:diego2010-05-091-0/+5
| | | | | | | | | | | | | | libmpdemux/muxer_mpeg.c:2121: warning: implicit declaration of function 'a52_syncinfo' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31146 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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-9/+9
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-9/+9
| | | | | | | | | | | | | | | | 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
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-201-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-4/+2
|\|
| * Add separate header for mp_a52_framesize(); avoids forward declarations.diego2010-02-171-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30618 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add separate header for aac_parse_frame(); avoids forward declarations.diego2010-02-171-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30616 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-200/+200
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Fix printf format strings with invalid '%lf' conversionUoti Urpala2009-12-151-16/+16
| | | | | | | | | | | | | | Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-201/+200
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+17
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-0/+17
| | | | | | | | 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.
* Add prototype for mp_a52_framesize().diego2009-05-051-0/+2
| | | | | | | This fixes an implicit declaration warning when liba52 is disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace double semicolon by single semicolon.diego2009-02-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove pointless parentheses from return statements.diego2008-05-161-10/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 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
* typo fix: inited --> initializeddiego2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put bff_mask into muxer context instead of a global variable.reimar2008-01-131-6/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25748 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function write_psm_block(), fixes the warning:diego2007-11-211-19/+0
| | | | | | | muxer_mpeg.c:763: warning: 'write_psm_block' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25126 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent unlikely memleaknicodvb2007-11-021-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24938 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, priv->use_psm can be 1 only if the format is genmpeg2nicodvb2007-11-021-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
* add streams to the PSM only if priv->use_psm is set, otherwise the muxer wouldnicodvb2007-11-021-1/+1
| | | | | | | write the map also for ordinary mpeg audio and video streams (wasting space) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24936 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the decision of the necessity of the PSM based on ↵nicodvb2007-11-021-2/+3
| | | | | | the format of the video stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed no more needed variablenicodvb2007-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24934 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the code that decides if the PSM is needednicodvb2007-11-021-11/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24933 b3059339-0415-0410-9bf9-f77b7e298cf2
* repeat the PSM once every second (in terms of delta_scr) otherwise playing ↵nicodvb2007-11-021-0/+23
| | | | | | the file from the middle would miss the first instance git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24932 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove the registration descriptor from the PSM: writing the fourcc in it ↵nicodvb2007-11-021-7/+2
| | | | | | makes it total crap git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24931 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100% cosmetics: reformatted with tabs and symmetric braces and removed ↵nicodvb2007-11-021-319/+324
| | | | | | useless braces and trailing tabs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24930 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed bug introduced with previous commit: patch_panscan() must work in the ↵nicodvb2007-09-281-1/+1
| | | | | | sequence_display_extension, not on se_ptr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l, the tff flag was never cleared before being overwritten with the ↵nicodvb2007-09-281-2/+4
| | | | | | | | | | | value on bff_mask; also, the sequence extension pointer was set to point to the sequence_display_extension, so the progressive_sequence was never set and the sde was being corrupted patch by Christopher Montgomery (xhiphmont xiph org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use proper PRI?64 format stringsreimar2007-06-241-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23657 b3059339-0415-0410-9bf9-f77b7e298cf2
* added :interleaving2, a better method to determine which stream whouls be ↵nicodvb2007-04-081-0/+14
| | | | | | | | | | flushed at every iteration of the loop (based on the lowest percentage of buffer used - same algo as libavformat) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22947 b3059339-0415-0410-9bf9-f77b7e298cf2
* in mpegfile_write_header(only for mpeg1/2) don't overwrite the values of ↵nicodvb2007-04-081-10/+0
| | | | | | bufsize with dwSuggestedBufferSize (those values are completely invented) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22945 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentationnicodvb2007-04-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22944 b3059339-0415-0410-9bf9-f77b7e298cf2
* in the system header set audio_locked/video_locked only for dvd and vcdnicodvb2007-04-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22943 b3059339-0415-0410-9bf9-f77b7e298cf2
* small syntax fix: muxrate is expressed in units of 400 bits/second, not 50 ↵nicodvb2007-04-081-1/+1
| | | | | | bytes per second git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22942 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, the scr must be reset before overwriting the first pack with the ↵nicodvb2007-04-071-0/+3
| | | | | | correct system header (format=mpeg1|2) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22935 b3059339-0415-0410-9bf9-f77b7e298cf2
* reversed r22879 until I discover why it's giving so many sync problems; I'll ↵nicodvb2007-04-071-3/+24
| | | | | | eventually recommit it in a fixed form git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22927 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed init_apts and init_vpts; added :adelay in addition to :vdelaynicodvb2007-04-011-6/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22899 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: removed trailing spacesnicodvb2007-04-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22897 b3059339-0415-0410-9bf9-f77b7e298cf2
* in flush_buffers() removed code that required the presence of an amount of ↵nicodvb2007-04-011-24/+3
| | | | | | audio data >= video data in the temporal domain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22879 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
* 2 less variablesnicodvb2007-02-251-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22351 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reformattednicodvb2007-02-251-65/+65
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22350 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablesnicodvb2007-02-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22349 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplified parse_mpeg12_video()nicodvb2007-02-251-82/+72
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22348 b3059339-0415-0410-9bf9-f77b7e298cf2
* member real_framerate is completely uselessnicodvb2007-02-251-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22346 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: reindentednicodvb2007-02-251-10/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22341 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed commented/useless code from parse_mpeg12_video()nicodvb2007-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22340 b3059339-0415-0410-9bf9-f77b7e298cf2
* all options must be GLOBAL; patch by Trent Piepho (xyzzy speakeasy org)nicodvb2007-02-181-21/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22261 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a few gcc warnings, approved by Diego and Reimar.rathann2007-02-051-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-181-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* align vbuf_size to the max value allowed by main profile @ high levelnicodvb2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-5/+5
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable telecining when it can't be appliednicodvb2006-12-041-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
* since display_frames in increased by a possibly negative number it had ↵nicodvb2006-12-041-1/+1
| | | | | | better be signed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmeticsnicodvb2006-12-041-16/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed dead codenicodvb2006-12-041-17/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
* reimplemented :telecine and :film2pal in terms of dgpulldownnicodvb2006-12-041-76/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
* pre-store in bff_mask the correct or-mask to be saved in the pce (slightly ↵nicodvb2006-12-041-5/+4
| | | | | | faster) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: wrong bitmask when patching the pce_ptr in soft_telecine()nicodvb2006-12-041-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
* added generalized teleciner by Donald Graftnicodvb2006-12-041-4/+61