Commit Graph

120 Commits

Author SHA1 Message Date
diego c4f6f66f9e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:41:00 +00:00
diego 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
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
reimar 80442027a0 Put bff_mask into muxer context instead of a global variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25748 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 21:06:30 +00:00
diego adf572f304 Remove unused function write_psm_block(), fixes the warning:
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
2007-11-21 09:14:01 +00:00
nicodvb 89a5add794 prevent unlikely memleak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24938 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 20:06:28 +00:00
nicodvb a5541ee85b 10l, priv->use_psm can be 1 only if the format is genmpeg2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 19:52:22 +00:00
nicodvb cd0c142521 add streams to the PSM only if priv->use_psm is set, otherwise the muxer would
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
2007-11-02 19:06:15 +00:00
nicodvb 3d584f9b18 moved to fix_parameters() the decision of the necessity of the PSM based on the format of the video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 19:01:13 +00:00
nicodvb ddd4c2e6d0 removed no more needed variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24934 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 18:52:08 +00:00
nicodvb d48b6c6cf5 moved to fix_parameters() the code that decides if the PSM is needed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24933 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 18:50:41 +00:00
nicodvb 2edf5a5ad3 repeat the PSM once every second (in terms of delta_scr) otherwise playing 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
2007-11-02 17:48:27 +00:00
nicodvb a7a6e41c24 remove the registration descriptor from the PSM: writing the fourcc in it makes it total crap
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24931 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 17:43:39 +00:00
nicodvb ddf7776199 100% cosmetics: reformatted with tabs and symmetric braces and removed useless braces and trailing tabs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24930 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-02 11:43:03 +00:00
nicodvb 1f2fa1ba48 fixed bug introduced with previous commit: patch_panscan() must work in the sequence_display_extension, not on se_ptr
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-28 21:20:41 +00:00
nicodvb 1cc65a7889 1000l, the tff flag was never cleared before being overwritten with the 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
2007-09-28 21:13:26 +00:00
reimar f58c64c3f3 Use proper PRI?64 format strings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23657 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 14:54:56 +00:00
nicodvb 745c0b9c38 added :interleaving2, a better method to determine which stream whouls be 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
2007-04-08 16:15:41 +00:00
nicodvb ee3adc95aa in mpegfile_write_header(only for mpeg1/2) don't overwrite the values of bufsize with dwSuggestedBufferSize (those values are completely invented)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22945 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:09:56 +00:00
nicodvb 76429f1c97 reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22944 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:00:47 +00:00
nicodvb 4cdcd89714 in the system header set audio_locked/video_locked only for dvd and vcd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22943 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 10:00:05 +00:00
nicodvb c675883bb4 small syntax fix: muxrate is expressed in units of 400 bits/second, not 50 bytes per second
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22942 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-08 09:50:27 +00:00
nicodvb 3e8e92dc2f 10l, the scr must be reset before overwriting the first pack with the correct system header (format=mpeg1|2)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22935 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:42:28 +00:00
nicodvb acb512df10 reversed r22879 until I discover why it's giving so many sync problems; I'll eventually recommit it in a fixed form
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22927 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 08:51:26 +00:00
nicodvb 5ca85e87e8 removed init_apts and init_vpts; added :adelay in addition to :vdelay
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22899 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 21:27:47 +00:00
nicodvb fc527ebd04 cosmetics: removed trailing spaces
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22897 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 20:03:24 +00:00
nicodvb f6314c2220 in flush_buffers() removed code that required the presence of an amount of audio data >= video data in the temporal domain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22879 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 12:25:31 +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
nicodvb 921e985a12 2 less variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22351 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 23:01:13 +00:00
nicodvb 37b65c2eca cosmetics: reformatted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22350 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 22:55:14 +00:00
nicodvb 7339fd9684 removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22349 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 22:41:17 +00:00
nicodvb 1bffdebffa simplified parse_mpeg12_video()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22348 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 22:40:05 +00:00
nicodvb bf15108d56 member real_framerate is completely useless
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22346 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 21:21:09 +00:00
nicodvb 72fa22f6b0 cosmetics: reindented
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22341 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 14:33:19 +00:00
nicodvb bc389eee92 removed commented/useless code from parse_mpeg12_video()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22340 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 14:32:14 +00:00
nicodvb 7593a4d298 all options must be GLOBAL; patch by Trent Piepho (xyzzy speakeasy org)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22261 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 16:46:12 +00:00
rathann 45defa1aa0 Fix a few gcc warnings, approved by Diego and Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:46:08 +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
nicodvb 3e7616ecab align vbuf_size to the max value allowed by main profile @ high level
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 22:21:37 +00:00
reimar 6caf5586ee Get rid of min/max macros from aviheader.h, they do not belong here.
Replace their uses by FFMIN/FFMAX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 12:24:11 +00:00
nicodvb e704821b75 disable telecining when it can't be applied
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 22:08:11 +00:00
nicodvb a176dc29b9 since display_frames in increased by a possibly negative number it had better be signed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:58:07 +00:00
nicodvb 9e365b6032 cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:27:05 +00:00
nicodvb 7057e42777 removed dead code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:24:39 +00:00
nicodvb 8ec5a6a3ca reimplemented :telecine and :film2pal in terms of dgpulldown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:20:01 +00:00
nicodvb 858813f36f pre-store in bff_mask the correct or-mask to be saved in the pce (slightly faster)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:38:46 +00:00
nicodvb 6dc68e8680 10l: wrong bitmask when patching the pce_ptr in soft_telecine()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:52:11 +00:00
nicodvb 2fded9964f added generalized teleciner by Donald Graft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:02:15 +00:00
nicodvb 6d8213c5d6 cosmetics: anti-chaos reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 12:06:08 +00:00
nicodvb b5ecb3ba07 permit to specify the sizes of the decoders' buffers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 23:51:51 +00:00