Commit Graph
2072 Commits
Author SHA1 Message Date
Uoti Urpala af3fcdf2de Merge svn changes up to r27025
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
2008-06-07 19:57:57 +03:00
ulion 7b17a4e2c4 Fix channel order for libvorbis decoder, original patched by Nicolas George.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:04:53 +00:00
ulion 2e7dc8d9fb rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:36 +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
reimar 6ab8ece718 Properly free memory allocate by liba52.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26955 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-01 16:40:56 +00:00
iive 08ec85ba4b Revert commit r26897.
XviD is the correct spelling of the codec. 
You can see it written in the codec own 
documentation and header files.

Prefered name capitalization confirmed 
in conversation with XviD developer (prunedtree).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-28 23:04:41 +00:00
diego 8ac2b7bbf5 cosmetics: XviD --> Xvid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 12:41:27 +00:00
diego e53887b234 Add missing MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26793 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-17 10:12:07 +00: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
diego 47ef593617 Use standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 10:16:20 +00:00
michael 5f5225d0b8 Factorize "int i".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 12:37:04 +00:00
diego def3ee8ac7 cosmetics: Fix unknow vs. unknowN typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26733 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 11:57:05 +00:00
michael 16aa40b6f8 Reformat very ugly code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26726 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:15:57 +00: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
michael 5d0b576f70 AVOptions support for libavcodec based video decoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26724 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 18:55:31 +00:00
ulion d915b7fc97 Reindent for last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26694 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 16:05:49 +00:00
ulion 30f7fb8c69 Distinguish between ac3 and dts by format tag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26693 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 15:55:21 +00:00
Uoti Urpala 267a3f4c9c Merge svn changes up to r26680
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-05-07 13:15:37 +03:00
diego e9de5ea8df Relicense file as GPL v2+; bero granted permission on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 07:49:35 +00:00
diego 7e9a5ca50a Enable Alpha/ARM optimizations in libmpeg2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26626 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 12:30:29 +00:00
Uoti Urpala 06a35804f3 Merge svn changes up to r26587
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
diego 0792780cb7 Use consistent #include paths without "../".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:50:24 +00:00
diego 2f690cb652 Consistently #include mpbswap.h instead of bswap.h everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:43:30 +00:00
Uoti Urpala 2faffe2a7f Merge svn changes up to r26555 2008-04-28 12:15:18 +03:00
Uoti Urpala 1b84ccbbfc vd.c: Make extern decoder declarations const
The earlier commit "Make video decoder description structs const"
made the definitions const but didn't change the extern declarations
in vd.c to match. Fix those to be const too.
2008-04-26 16:53:47 +03:00
Uoti Urpala 170d69a71e Make audio decoder description structs const
Make the per-decoder struct ad_functions and its ->info struct
constants. Same for the mpcodecs_ad_drivers[] table of pointers to
those structs.
2008-04-26 16:51:17 +03:00
Uoti Urpala def7ed045d vf_divtc.c: Make pointlessly static variable a normal local
Apparently because it was declared together with local constant tables
(for which the "static" part was useless but harmless) a pointer
variable was also declared static.
2008-04-26 16:38:40 +03:00
Uoti Urpala 05ad815133 Mark some constant symbols as such 2008-04-26 16:35:40 +03:00
diego 21c9bd3b8b Only compile libmpcodecs/ve_qtvideo.c on Windows.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 10:53:32 +00:00
Uoti Urpala 2b47fd59ab Merge svn changes up to r26540
Conflicts:

	Makefile
2008-04-26 09:39:09 +03:00
Uoti Urpala 0885f4e5b5 Move vf_settings to options struct 2008-04-26 01:19:29 +03:00
Uoti Urpala 4db72f6a80 Move vo_gamma_* to options struct 2008-04-26 01:19:29 +03:00
Uoti Urpala 31db39d8ec Make video decoder description structs const
This makes the per-decoder struct vd_functions and its ->info
struct constants. Same for the mpcodecs_vd_drivers[] table of
pointers to those structs.
2008-04-25 07:16:32 +03:00
Uoti Urpala 7dc4226348 Move vd_use_slices to options struct 2008-04-25 07:15:07 +03:00
Uoti Urpala bb679dd40a Remove global vo_flags
Move the information to struct sh_video field.
2008-04-25 07:15:07 +03:00
Uoti Urpala 60f104d4aa vd.c: Cosmetic changes + remove malloc.h
Adjust formatting slightly and remove some comments. Also remove
"#include malloc.h" which seems completely irrelevant.
2008-04-25 07:15:07 +03:00
Uoti Urpala 6e0199537c Reformat vd.c
"indent -kr -l79 -nut dec_video.c --ignore-newlines vd.c", fix two
"sh_video_t * sh" to "sh_video_t *sh" by hand.
2008-04-25 07:14:44 +03:00
Uoti Urpala 60e2c8604d Move movie_aspect to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala 0a39709c15 Move screen_size_xy to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala b14909a955 Move opt_screen_size_[x|y] to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala 1351b50ea5 Move flip and softzoom to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala 0dc3a72273 Move vidmode to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala 41d6879236 Move fullscreen to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala 342ae8d3b5 Store video decoder functions in struct sh_video field
Remove the global variable mpvdec and move the video decoder pointer
to struct sh_video field vd_driver. Audio already had a similar
ad_driver field from before.
2008-04-25 03:34:27 +03: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
Uoti Urpala 6f971b6354 dec_video.c: A couple of cosmetic changes 2008-04-25 03:31:57 +03:00
Uoti Urpala e5b3655e90 Reformat dec_video.c
"indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix
some "unknown_typedef * arg" in parameter lists by hand to
"unrecognized_typedef *arg".
2008-04-25 03:31:57 +03:00
Uoti Urpala 3fa6f2d3e1 Move -lavdopts to options struct 2008-04-25 03:31:57 +03:00
Uoti Urpala 15b34d1fd8 vd_ffmpeg.c: Eliminate some compiler warnings
Make the functions used in avctx->draw_horiz_band match its type (add
a "const"). Add cast to avoid void * arithmetic.
2008-04-25 03:29:27 +03:00