summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* codecs.conf: add M701: Matrox MPEG-2 intra-only.cehoyos2010-11-021-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31342 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Fix typo in commenthyc2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31341 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Remove nonsense commented-out function headerreimar2010-10-271-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31340 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Make ds_get_next_pts work for the first packet of a streamreimar2010-10-271-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31338 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: Minor code simplification.reimar2010-10-271-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31336 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_real: Don't try to read index if stream is not seekablereimar2010-10-271-1/+2
| | | | | | | Fixes playback of piped real files (except multirate where this seems not possible). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31335 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv: support V_MJPEG video tagUoti Urpala2010-10-272-0/+2
|
* demux_mkv: accept files with no doctype in EBML headerUoti Urpala2010-10-211-1/+4
| | | | | | Assume files which start with an EBML header but have no DocType element in that header have type "matroska", and attempt to play them. Reportedly some mkvmerge versions create such files.
* TOOLS/matroska.py: recognize ChapCountryUoti Urpala2010-10-211-0/+1
|
* vd_ffmpeg: fix aspect ratio problems with recent FFmpegUoti Urpala2010-10-161-0/+2
| | | | | | | | | | The code left ctx->last_sample_aspect_ratio at 0/0 when allocating a context. In older FFmpeg versions av_cmp_q() against 0/0 always said the numbers are equal; but this changed recently, triggering incorrect overwrite of container aspect ratio. The logic looks like it'd need further fixes, but for now just initialize last_sample_aspect_ratio to 0/1; this should restore the previous behavior from before FFmpeg changes, which worked well enough for the most common cases.
* vd_ffmpeg: fix calloc/av_free mixupUoti Urpala2010-10-161-7/+4
| | | | | | avctx->palctrl was allocated with calloc() but freed with av_freep(). Free it with free() instead. Also change the main decoder context allocation to use talloc.
* af_lavcac3enc: fix assert failure "s->expect_len <= s->pending_data_size"Uoti Urpala2010-10-141-11/+11
| | | | | | | The code handling input format negotiation incorrectly used the bps value of the suggested input format instead of the format it was going to actually use. As a result the player could abort with the above assertion failure. Fix.
* vo: improve fixed-vo behavior when video size changes in x11 VOsUoti Urpala2010-07-232-0/+26
| | | | | | | | | Now the window is only resized when video size (or size specified by -geometry) changes; reconfiguring the window with the same size no longer changes back to default size from possibly user-modified one. Also fix a bug in fullscreen handling that could cause incorrect window size when turning fullscreen off.
* Merge svn changes up to r31332Uoti Urpala2010-06-054-4/+31
|\
| * Update codecs.conf version again, we had quite a few additions to it.reimar2010-06-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31332 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend -vf format to allow substituting the format for a compatible onereimar2010-06-052-3/+28
| | | | | | | | | | | | | | (e.g. chaning rgb24 to bgr24). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix -vf format and -vf noformat to work with slices.reimar2010-06-052-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn change r31329Uoti Urpala2010-06-050-0/+0
|\| | | | | | | Already supported.
| * Add webm/VP8 support to native matroska demuxer.reimar2010-06-052-1/+3
| | | | | | | | | | | | | | Patch by James Zern [jzern google com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31329 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes r31318 to r31328Uoti Urpala2010-06-0511-297/+38
|\| | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
| * If we have no FPS value, try enabling -correct-pts mode, it doesreimar2010-06-051-2/+2
| | | | | | | | | | | | | | 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.reimar2010-06-051-1/+9
| | | | | | | | | | | | | | 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.reimar2010-06-051-1/+2
| | | | | | | | 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 casereimar2010-06-051-2/+0
| | | | | | | | | | | | | | 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 shouldreimar2010-06-051-2/+0
| | | | | | | | | | | | | | 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,reimar2010-06-051-2/+0
| | | | | | | | | | | | | | 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.cehoyos2010-06-052-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 rev. 31292jrash2010-06-051-9/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31321 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove colorspace conversion code from -vo yuv4mpeg, -vf scale shouldreimar2010-06-053-271/+5
| | | | | | | | | | | | | | | | 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.reimar2010-06-052-6/+6
| | | | | | | | | | | | | | | | 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 claimsreimar2010-06-051-1/+4
| | | | | | | | | | | | | | it is supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes r31316, r31317Uoti Urpala2010-06-050-0/+0
|\| | | | | | | | | | | 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.
| * Do not use libass functions if it is disabled.reimar2010-06-041-1/+1
| | | | | | | | | | | | | | 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 effectreimar2010-06-041-3/+2
| | | | | | | | | | | | | | (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
* | Merge svn change r31315Uoti Urpala2010-06-051-0/+1
|\|
| * Force window placement also if -xineramascreen was set >= 0,reimar2010-06-041-0/+1
| | | | | | | | | | | | | | not only if -geometry was given. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes r31308 to r31314Uoti Urpala2010-06-050-0/+0
|\|
| * apply missing bits from ↵siretart2010-06-031-0/+6
| | | | | | | | | | | | 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 knowreimar2010-06-031-4/+0
| | | | | | | | | | | | | | | | 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.reimar2010-06-031-14/+17
| | | | | | | | | | | | | | | | | | | | 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 seemsreimar2010-06-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | 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 libswscalesiretart2010-06-031-4/+10
| | | | | | | | | | | | | | | | | | | | 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
| * Simplify libass version check.cehoyos2010-06-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31309 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Raise LIBASS_VERSION, forgotten in r31293.cehoyos2010-06-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31308 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes r31306, r31307Uoti Urpala2010-06-051-1/+4
|\|
| * Add the -march fallback for amdfam10 also to the x86_64 case.reimar2010-06-021-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31307 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libavcodec/libx264.c requires x264 0.98 since r23430.cehoyos2010-06-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31306 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes r31304, r31305Uoti Urpala2010-06-050-0/+0
|\|
| * Fix compilation with external libass.cehoyos2010-06-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31305 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ass_set_aspect_ratio() takes three arguments since 0x00907010.cehoyos2010-06-022-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
* | configure: fix disabling of (x)mga without swscale internalsUoti Urpala2010-06-041-1/+3
| | | | | | | | | | | | 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.
* | mp3lib: use ffmpeg_files/x86_cpu.hUoti Urpala2010-06-034-4/+4
| |
* | options: fix -a52drc default value (should be 1)Uoti Urpala2010-06-031-0/+1
| | | | | | | | | | | | | | 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.
* | demux_mkv: enable automatic index generation by defaultUoti Urpala2010-06-021-1/+1
| | | | | | | | | | | | | | | | | | 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 r31303Uoti Urpala2010-06-026-44/+68
|\|
| * avoid using swscale internals by copying in palette8torbg16 and its bgr variantsiretart2010-06-011-1/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend geometry parsing to reject all invalid strings.reimar2010-06-011-9/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31302 b3059339-0415-0410-9bf9-f77b7e298cf2
| * deprecate palette8topacked32 in favor of public API functions ↵siretart2010-06-015-39/+81
| | | | | | | | | | | | | | | | | | | | | | | | sws_convertPalette8ToPacked32 and -24 additionallym deprecate palette8torgb16 and its bgr variant without replacement. These functions are not meant to be used by applications. Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move internal scale context fields initialization fromstefano2010-06-012-50/+24
| | | | | | | | | | | | | | | | sws_setColorspaceDetails() to ff_yuv2rgb_c_init_tables(). Allow to factorize duplicated code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31300 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r23402.cehoyos2010-06-012-5/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove palette8torgb15 and palette8tobgr15siretart2010-06-013-28/+0
| | | | | | | | | | | | | | | | | | They contain exactly the same code as their 16bit variants, so this is effectively code de-duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out some common code and ensure we will not try to draw OSDreimar2010-05-311-3/+12
| | | | | | | | | | | | | | elements outside the streams and thus crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
| *