Commit Graph

24 Commits

Author SHA1 Message Date
Uoti Urpala 035611f0a7 demux_y4m: fix failure with nonseekable input
Playback of nonseekable y4m streams was broken by a change merged from
svn, r30970 which added support for multiple yuv4mpeg files
concatenated together. The change included a stream_skip(stream, -1)
call which only works for seekable files. Work around this by
disabling the concatenated-file check for nonseekable streams. This
means concatenated files are only supported if the stream is seekable,
but this is an improvement compared to the svn commit which caused a
regression making _all_ files fail in the nonseekable case.

It would be reasonably easy to make the concatenation support work in
all cases, either by modifying demux_y4m or (probably better) adding a
general stream API to allow pushing back the read byte. However for
now I'm only fixing the regression with the above trivial change.
2010-04-30 20:07:38 +03:00
Uoti Urpala 6a7956a11b Merge svn changes up to r30972 2010-04-26 17:44:48 +03:00
reimar 67dcbed681 Support concatenated YUV4MPEG files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30970 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 16:01:22 +00:00
reimar ce67a0caf7 Use calloc instead of malloc+memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30969 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 15:35:59 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego 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
diego 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
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +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
diego 9c2d44923a Remove superfluous bswap.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
corey 1ab575101a Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

I've quadruple checked this time; hopefully I haven't missed anything.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
corey 3f6e7ce5f5 Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
corey 15debd85d2 1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
   that mplayer/mencoder will instantly be in sync even when -delay is
   specified.

Other demuxers could be modified similarly in the future.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
faust3 1b7f873c9c 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15818 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-26 15:15:38 +00:00
rik 5328d48fbe fix bug reported by Leonardo Giordani: sh->aspect is not pixel aspect but movie aspect
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12530 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-03 09:52:25 +00:00
alex c67632e7f5 fix crash on streams with frame tags, patch by Brett Kosinski <brettk@frodo.dyn.gno.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9655 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-22 19:50:10 +00:00
albeu 2b955d3b05 Added demuxer uninit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5811 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-24 15:36:07 +00:00
alex 1cdfbc1fbc Applied Rik Snel's seeking patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3864 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-28 22:58:49 +00:00
alex 4846991328 aspect ratio patch by Rik Snel
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3801 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-27 19:54:36 +00:00
alex 9ceaa48f02 fixed YUV4MPEG frame reader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3791 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-27 11:39:47 +00:00
alex 46fb559fd7 added support for older YUV4MPEG format (used by xawtv)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3790 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-27 11:30:07 +00:00
arpi 5194d8791e yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3787 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-27 02:08:31 +00:00