aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge svn changes r31318 to r31328Gravatar Uoti Urpala2010-06-05
|\ | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
* \ Skip svn changes r31316, r31317Gravatar Uoti Urpala2010-06-05
|\ \ | | | | | | | | | | | | | | | r31316 is not exactly wrong, but the way forcing FPS works is overall quite broken. If there's a real need to add that test then other code would need to be fixed too.
* \ \ Merge svn change r31315Gravatar Uoti Urpala2010-06-05
|\ \ \
* \ \ \ Skip svn changes r31308 to r31314Gravatar Uoti Urpala2010-06-05
|\ \ \ \
* \ \ \ \ Merge svn changes r31306, r31307Gravatar Uoti Urpala2010-06-05
|\ \ \ \ \
* \ \ \ \ \ Skip svn changes r31304, r31305Gravatar Uoti Urpala2010-06-05
|\ \ \ \ \ \
| | | | | | * If we have no FPS value, try enabling -correct-pts mode, it doesGravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not require any FPS value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31328 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Add partial support for dirac to TS demuxer.Gravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. no header parsing is implemented so -fps must be specified manually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31327 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Also print current stream position in mp_read debug output.Gravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31326 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Remove explicit eof check for mp_read code, stream code handles this caseGravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better, e.g. properly supporting growing files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31325 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Di not do a stream_reset on seeking backwards, the seek itself shouldGravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do whatever is best/necessary, this method will just drop cached data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31324 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Do not make seek fail explicitly simply because eof was hit somewhen,Gravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead reuse the eof checking code further down. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31323 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Fix compilation after FFmpeg r23485.Gravatar cehoyos2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * sync with en/mplayer.1 rev. 31292Gravatar jrash2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31321 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Remove colorspace conversion code from -vo yuv4mpeg, -vf scale shouldGravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be able to handle this just as well (or better) including interlaced. If not, this needs to be fixed there instead of duplicating code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31320 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Sync libdvdcss with their latest SVN.Gravatar reimar2010-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular fixes a wring return value check which caused descrambling to be aborted for no good reason. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31319 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | * Add support for -geometry x syntax since the documentation claimsGravatar reimar2010-06-05
| | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Do not use libass functions if it is disabled.Gravatar reimar2010-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes compilation if freetype is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31317 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Default to -correct-pts off if -fps was given, since -fps has no effectGravatar reimar2010-06-04
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (and doesn't really make sense) with correct-pts mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31316 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Force window placement also if -xineramascreen was set >= 0,Gravatar reimar2010-06-04
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | not only if -geometry was given. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | | configure: fix disabling of (x)mga without swscale internalsGravatar Uoti Urpala2010-06-04
| | | | | | | | | | | | | | | | | | | | | | | | The _mga/_xmga variables weren't changed to "no", causing a build failure if mga/xmga support would have been otherwise enabled but was only switched off because of the swscale test.
| | | * apply missing bits from ↵Gravatar siretart2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31314 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Try always enabling correct pts again for lavf demuxer, since the knowGravatar reimar2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue with PAFF seems solved to me, and disabled correct-pts causes flickering with -ass (which of course should be fixed as well though). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31313 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Limit buffered PTS only when we actually got a frame from the decoder.Gravatar reimar2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids some issues with H.264 PAFF due to dropping PTS values too early because only every second packet actually produced output. Just keeping up to one additional pts value would have avoided this particular issue as well, but this is more generic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * If an invalid pts value is detected, try to to make up some if it seemsGravatar reimar2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reasonable. This avoids completely losing A-V sync e.g. when pts was not reordered correctly. This was tested with http://samples.mplayerhq.hu/V-codecs/h264/PAFF/tv_cut.mkv for this sample proper pts reordering is the correct solution, but more resilient handling of the error case is still useful. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31311 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * vo_yuv4mpeg: disable RGB support when compiling against a shared libswscaleGravatar siretart2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids using swscale internals when compiling against a shared libswscale. Patch inspired by Uoti Urpala's work in his git branch: http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | | mp3lib: use ffmpeg_files/x86_cpu.hGravatar Uoti Urpala2010-06-03
| | | |
* | | | options: fix -a52drc default value (should be 1)Gravatar Uoti Urpala2010-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3f076c0fb3 ("options: move -a52drc to option struct") from yesterday left out setting the default value of the option, effectively changing the default from 1 to 0. Add the missing part to change it back to 1.
| | | * Simplify libass version check.Gravatar cehoyos2010-06-03
| | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31309 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * Raise LIBASS_VERSION, forgotten in r31293.Gravatar cehoyos2010-06-03
| | |/ | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31308 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Add the -march fallback for amdfam10 also to the x86_64 case.Gravatar reimar2010-06-02
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31307 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * libavcodec/libx264.c requires x264 0.98 since r23430.Gravatar cehoyos2010-06-02
| |/ | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31306 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with external libass.Gravatar cehoyos2010-06-02
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31305 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ass_set_aspect_ratio() takes three arguments since 0x00907010.Gravatar cehoyos2010-06-02
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv: enable automatic index generation by defaultGravatar Uoti Urpala2010-06-02
| | | | | | | | | | | | | | | | | | Change demux_mkv to behave by default as it did with -idx before. The index generation code in demux_mkv linearly scans the file up to the seek timestamp (it doesn't read the whole file up front like some other demuxers do). Doing that is probably a better default for files with no index than rejecting the seek request and asking user to specify -idx.
* | Merge svn changes up to r31303Gravatar Uoti Urpala2010-06-02
|\|
* | Skip svn changes up to r31294 (mostly)Gravatar Uoti Urpala2010-06-02
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | -a52drc range extension was already done earlier (and the svn commit is buggy for ad_liba52). However keep the man page change (this is the only part not skipped). We don't want to use lavf for Matroska demuxing; it's questionable whether that's a good idea even in svn, and the internal demuxer here is definitely a better choice.
* \ \ Merge svn changes up to r31291Gravatar Uoti Urpala2010-06-02
|\ \ \
* \ \ \ Skip svn changes up to r31287Gravatar Uoti Urpala2010-06-02
|\ \ \ \
* | | | | ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_levelGravatar Uoti Urpala2010-06-02
| | | | |
* | | | | options: move -a52drc to option structGravatar Uoti Urpala2010-06-02
| | | | | | | | | | | | | | | | | | | | Also allow a range up to 2.
* | | | | Skip svn change r31285Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Internal FFmpeg build stuff.
* \ \ \ \ \ Merge svn changes up to r31284Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ \
* \ \ \ \ \ \ Skip svn changes up to r31280Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Mostly stuff related to internal FFmpeg builds only.
* \ \ \ \ \ \ \ Merge svn changes up to r31275Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Skip svn changes up to r31267Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perhaps porting some of the non-pkgconfig libass detection logic from configure would have some use, but I'm not doing it now at least.
* \ \ \ \ \ \ \ \ \ Merge svn changes up to r31265Gravatar Uoti Urpala2010-06-02
|\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | stream_radio.c: fix corrupt line from e3061749Gravatar Uoti Urpala2010-06-02
| | | | | | | | | | |
* | | | | | | | | | | libass: match font attachments based on extensionGravatar Grigori Goronzy2010-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of only relying on the MIME type, use the file extension as a fallback for deciding which attachments are fonts and should be fed to libass. This also refactors the check into a separate function in mpcommon.
| | | | | | | | | | * avoid using swscale internals by copying in palette8torbg16 and its bgr variantGravatar siretart2010-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2