RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 15:34:31 +00:00
Code Issues Releases Wiki Activity
30,329 Commits 43 Branches 87 Tags 171 MiB
e43926d6d1
Commit Graph

185 Commits

Author SHA1 Message Date
Uoti Urpala
287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
reimar
c6b1e6880b Only call avcodec_close if the open succeeded before, otherwise avcodec_close 
will crash (happens e.g. when encoding ends before any frames were actually encoded,
e.g. when an MPEG file was cut down to much so it no longer contains a full video frame).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29835 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-06 15:45:55 +00:00
Uoti Urpala
7fd3eb0f74 Merge svn changes up to r29752 
As part of merging subtitle-in-terminal changes make
update_subtitles() only clear existing subtitles if called with the
reset argument, and not try to set new ones. Later calls should set
the needed new subtitles, and this change avoids some problems with
trying to set subtitles when mp_property_sub() in command.c gets
called from initialization code before full initialization.
 2009-10-06 04:48:00 +03:00
reimar
3f9cacf5d5 Change type to avoid void * arithmetic. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29716 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-25 09:44:41 +00:00
reimar
101d331f62 Set codec_type and codec_id in codec context for lavc encoders. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-25 09:43:59 +00:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings 
Replace all MSGTR_ macros in the source by the corresponding English
string.
 2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings 
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
 2009-07-07 01:28:07 +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
Uoti Urpala
9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
diego
56d9a23ee9 Add support for libavcodec GMC flag, patch by Dave Baker, dbkr mxtelecom com. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28415 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 02:10:31 +00:00
Uoti Urpala
ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
diego
9fdb04a3d8 Update libavcodec 'aic' flag define to match current FFmpeg. 
patch by Dave Baker, dbkr mxtelecom com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28395 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-30 23:08:36 +00:00
Uoti Urpala
259ea9d703 Merge svn changes up to r27573 
Conflicts:
	libmpcodecs/vd_ffmpeg.c
 2008-09-10 23:59:08 +03:00
uau
923f67082e Fix compilation after libavcodec major version 52 changes 
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
 - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
 - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
 - Don't set AVCodecContext->rtp_mode (already marked unused before).
 - Use ff_eval2() instead of ff_eval().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-08 17:02:32 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374 
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
 2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives. 
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
 2008-07-30 12:01:30 +00:00
Uoti Urpala
3a69d65f8d Merge svn changes up to r27347 
Conflicts:

	libvo/x11_common.c
	libvo/x11_common.h

Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
 2008-07-25 02:50:58 +03:00
diego
fa164d8a94 Add Dirac video support via libdirac and libschroedinger in libavcodec. 
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-22 22:58:51 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
diego
c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 00:23:02 +00:00
Uoti Urpala
a41db36b22 Merge svn changes up to r26783 
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
 2008-05-15 21:19:35 +03:00
michael
ea56b3061c AVOption support for video encoders. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26725 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-10 19:07:26 +00:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names 
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
 2008-04-25 03:34:22 +03:00
diego
06cbb5007c Restore grayscale decoding support with FFmpeg. 
Removing support was done due to a silly misunderstanding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-13 00:03:11 +00:00
diego
ca1fb12840 Grayscale encoding/decoding with FFmpeg is no longer enabled, remove references 
from the documentation and the relevant options from the glue code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26198 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-07 21:30:01 +00:00
diego
21c200e767 FFmpeg now uses different (unified) #include paths. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-25 15:46:36 +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
cd4c2fdfb4 Support lowdelay flag 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24349 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-06 08:57:50 +00:00
michael
16be45ef4a make x264 work again after the h264-libx264 renaming 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24024 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-07 18:48:13 +00:00
michael
2fe0411b9a allow to specify the audio bitrate in bits (some codecs need that ...) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23977 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-31 17:51:39 +00:00
michael
96f2f7d45f make timestamps out of hot air 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23974 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-31 17:12:28 +00:00
michael
e5935e91ce make a few more parameters accessable from mplayer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23973 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-07-31 17:09:54 +00:00
corey
f58a3d0fda Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-17 00:16:51 +00:00
corey
3bfd50bdd8 Add DV fourcc. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23306 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-13 17:51:17 +00:00
cehoyos
cce240cd0c add "level" as lavc option 
Patch by Gustavo Sverzut Barbieri, barbieri ! gmail x com
reference:
Subject: [MPlayer-dev-eng] [PATCH] add "level" as option to lavc (aka
Mencoder generating PS3 playable h264 videos)
Date: 2007-05-03 13:56 +200


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23227 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-03 17:05:39 +00:00
diego
20d778b3fa Add explicit location for headers from the libmpdemux/ directory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 17:51:32 +00:00
diego
6b14d50848 Add explicit location for headers from the stream/ directory. 
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 17:30:55 +00:00
reimar
8ff440d6a4 Fix compilation after deprecation of some lav log level and 
pixel format stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-07 09:58:23 +00:00
corey
da8cb27dbd support lavc mblmin and mblmax 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20772 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-08 03:22:03 +00:00
reimar
88c688595e Add proper flv fourcc 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20435 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-24 18:45:17 +00:00
michael
b85ad74dc9 pass average bitrate from encoder to (lavf) muxer 
this fixes some problems with muxing mp4 files for the psp


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19366 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-10 21:48:41 +00:00
diego
b5de6c39e6 Remove #if LIBAVCODEC_BUILD >= XXX and #if LIBAVFORMAT_BUILD >= XXX jungle. 
It served no apparent purpose anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19078 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-13 23:02:03 +00:00
diego
e364249f21 Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18981 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-07-09 16:01:36 +00:00
corey
5414825bac Support and document lavc b_sensitivity option. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18573 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 06:37:29 +00:00
lorenm
c7032926c9 document the recent changes in Snow. 
new lavcopts: 'refs', 'vqscale=0'



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18570 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-05 05:34:26 +00:00
corey
447119777b support lavc mv0_threshold 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18490 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-05-13 20:18:57 +00:00
reynaldo
b4c74fb28e Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18005 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-31 00:15:47 +00:00
michael
a812e6fc3c lavc doesnt pass AVFrame.opaque around :/ 
so lets use AVFrame.pts and hope lavcs pedantic timestamp checks like what mencoder generates ...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17910 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 23:06:09 +00:00
michael
565af71e4f 10l (null pointer dereference) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17908 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 22:12:48 +00:00