Commit Graph

32907 Commits

Author SHA1 Message Date
reimar 851bb3ce82 demux_asf: add sanity check
Check that rlen is valid before using it to increment a pointer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32832 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:47:03 +02:00
reimar 179cb785e9 configure: disable libmpcdec by default
Disable libmpcdec (musepack) support by default, FFmpeg has a decoder
that works better for us and is used by default.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32826 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:46:17 +02:00
Uoti Urpala f7d8bba686 cleanup: mplayer.c: clean up pause_loop() a bit 2011-02-15 18:38:43 +02:00
reimar ba3dab4639 terminal output: show cache fill changes in "PAUSED" message
Convert cache_fill_status into a function so we always get the latest
state, not whatever it was after the last read.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32818 b3059339-0415-0410-9bf9-f77b7e298cf2

Update PAUSED status line with cache fill status if it changed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32819 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-02-15 18:35:34 +02:00
Uoti Urpala 398643d0d7 configure: remove unused maemo check
configure had a check for some libraries specific to the maemo
platform. Apparently the code which would have used the results of
this check was never added. Remove the unused check.
2011-02-15 16:42:55 +02:00
Uoti Urpala ac443f6fd5 configure: use LINGUAS environment variable for messages
Previously the default with --enable-translation was to install all
language files if --language-msg was not explicitly specified. Change
the default to the languages set with the --language option or LINGUAS
environment variable if those are set; if neither is set then the
default is still to install all message languages.
2011-02-15 16:33:27 +02:00
Uoti Urpala 685bbb5734 DOCS/xml/en: remove various outdated documentation
The XML documentation was badly outdated, with various obsolete,
useless and and sometimes actively harmful advice. Delete a lot of the
obsolete stuff, without spending much effort to replace it for now.

In the FAQ section I removed some questions completely; in other cases
I only removed the answer if I thought the entry might be worth
keeping but the answer would need to be updated.
2011-02-15 12:08:16 +02:00
Uoti Urpala 0321f6ce3c documentation: remove Changelog, rewrite README
The Changelog and README files were badly out of date. Remove
Changelog and replace README with a new minimal one.
2011-02-15 12:04:32 +02:00
Uoti Urpala b7e2899655 configure: abort if FFmpeg libraries are not found
Abort if FFmpeg libraries are not found unless --disable-ffmpeg was
explicitly specified. Note that even if you disable FFmpeg, libavutil
and libswscale are still required and you'll need to add linker flags
for them manually; I didn't try to clean up that case (few people
will want to do that).

Also fix the fallback test used if pkg-config doesn't find the
libraries: fix wrong header name and drop forced -lavcore which isn't
present in all FFmpeg versions. This shouldn't make a difference for
normal use since the pkg-config test should succeed if the libraries
are available.
2011-02-08 19:07:17 +02:00
Uoti Urpala e1a8392cae fix compilation with old FFmpeg versions
af_lavcac3enc: use old SampleFormat names without AV_ prefix, the
latter were only added in 2010-11

vd_ffmpeg: add ifdef around CODEC_ID_LAGARITH use

demux_real: use ffmpeg_files/intreadwrite.h

stream/http.c, stream/realrtsp/real.c: define AV_BASE64_SIZE macro for
old libavutil versions lacking it
2011-02-08 19:07:10 +02:00
Uoti Urpala cba6d60bcd ffmpeg_files/taglists.c: add new FFmpeg values
Updated to last FFmpeg svn version values (r26400).
2011-02-05 03:38:50 +02:00
Uoti Urpala 1f1ef44dd1 input: accept Shift modifier for Enter and Tab keys
Enter and Tab are the only named keys (rather than identified by the
printable character they produce) with code below 256. Add a special
case to recognize the Shift modifier with them.
2011-02-05 02:16:17 +02:00
Uoti Urpala 7f576e8b66 input: remove incorrect "CTRL" keyname alias for backspace
The keycodes.h file contains a KEY_CTRL define, then various control
keys expressed as "KEY_CTRL + 0" and so on. Back in 2002 when the key
name table in input.c was created this KEY_CTRL define was mistakenly
interpreted as a key name, apparently confusing it with the Ctrl key
(even though the input system didn't handle that key back then). As a
result there was an incorrect key name entry with the same key code as
backspace and name "CTRL". This incorrect entry was used when printing
the name of the key. Delete it.
2011-02-05 02:13:58 +02:00
Uoti Urpala 106c5f9989 x11_common: fix for reconfig with pos/xineramascreen set
vo_x11_create_vo_window() only called vo_x11_update_geometry() if no
window position had been specified by -geometry or -xineramascreen, to
avoid overwriting the specified position with values from the existing
window. However window size should be initialized to the existing
window here, and setting new window title for -use-filename-title is
also done in vo_x11_update_geometry() (for whatever reason, it doesn't
match what else that function does). Change the code in
vo_x11_create_vo_window() to always call vo_x11_update_geometry() for
size variable and window title updates, but add a flag that tells it
not to update position variables.
2011-02-03 21:49:12 +02:00
Uoti Urpala c24d4e9ec2 af_lavcac3enc: fix for lavc AC-3 encoder change to float input
The libavcodec AC-3 encoder was changed to use floats, and take
floating point samples as input (the fixed-point version is still
available under the new name "ac3_fixed"). This broke af_lavcac3enc
because it blindly assumed without checking that the "ac3" encoder
would take signed 16-bit integer samples. Improve af_lavcac3enc so
that it checks the sample formats supported by the encoder and can
handle either int16_t or float.

Perhaps an option to keep using integer input but instead switch the
encoder name to "ac3_fixed" for new libavcodec versions would have
some value. Then again, maybe not. Using the preferred data format of
the default "ac3" encoder should normally be best, so probably better
not add such an option unless real need appears.
2011-02-03 04:55:20 +02:00
Uoti Urpala 0cb63ea722 ad_ffmpeg: add missing extradata padding
One of two alternative code parts passing codec extradata to
libavcodec didn't add the buffer padding that libavcodec requires,
resulting in invalid reads beoynd allocated memory area. Fix.
2011-02-02 09:13:14 +02:00
Uoti Urpala dbb47bb2ec configure: print "Unknown parameter: " error to stderr
Print the "Unknown parameter: " line shown for unrecognized configure
options to stderr; other fatal errors are already directed there.
2011-02-02 02:18:51 +02:00
Uoti Urpala ed575cb710 configure: drop unused liblzo and bzlib tests
The configure liblzo test was left over from MEncoder functionality,
bzlib from internal FFmpeg build. Remove both.
2011-02-02 00:18:16 +02:00
Uoti Urpala 3bf725c39f configure: prefer libvorbis to libvorbisidec/tremor
libvorbis and libvorbisidec cannot both be enabled at the same time.
Change configure to enable libvorbis by default if both are
available. It's the more common library, and if someone want to do a
special build for FPU-less systems he can select the library
manually.
2011-02-01 21:30:53 +02:00
Uoti Urpala 6122d83981 tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg
demuxer (which is still sometimes useful to work around libavformat
ogg demuxer problems, though it's itself quite buggy) now cannot be
compiled without either external libvorbis or libvorbisidec (tremor).
2011-02-01 21:28:03 +02:00
Uoti Urpala 7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala 156ba34ac7 Copyright: delete removed library copies from list 2011-02-01 04:42:37 +02:00
Uoti Urpala 5db34ebd93 terminal output: change infamous "Core dumped" message
The "Core dumped ;)" message printed after finishing a stream dump is
known to confuse users but was kept as "humor". Change it to say
"Stream dump complete." instead.
2011-02-01 04:30:02 +02:00
Uoti Urpala ebce4808fc manpage: remove BUGS section, misc fixes
About the only useful part of the BUGS section on the manpage was a
link to mplayerhq.hu, and that doesn't really apply any more (includes
references to Subversion etc). Remove that section and update/remove
some outdated info.
2011-02-01 04:22:11 +02:00
Uoti Urpala fad3585ef4 options: remove CONF_OLD option flag
The resulting semantics of this flag are weird enough that they're
unlikely to be what is wanted in any situation. Remove the flag and
convert the two options using it, -screenw and -screenh, to use
CONF_NOSAVE instead. I'm not sure why those specific options had the
flag and if any flag is really needed, but I don't want to check in
detail now and using CONF_NOSAVE should keep about the same behavior
in practice.

A bit more detail about the weird behavior this flag had:

When not using file groups, the flag had the same behavior as
CONF_NOSAVE, namely that when switching files the option would not be
reset to the global value (only possible file-specific settings were
applied). When using file groups, group-specific options would apply
to the _first two_ files in the group, but for the rest after the
first two, settings would not be reset when changing files (wtf?).
This was a result of the following sequence:
1) push higher-level settings, enter group
2) apply group-specific settings
3) push settings before applying ones specific to file 1 in group
4) apply file 1 settings, play file 1
5) pop settings to return to group settings
6) push settings before applying ones specific to file 2
7) apply file 2 settings
8) pop settings

Here the option was set at 2). 3) saved it because it had been set
after last push, so 5) restored the setting and it was used for file 2
too. However 6) no longer saved it because there had been pushes after
the original setting in 2), thus 8) no longer restored the setting and
the option was no longer forced to any particular value when playing
further files after that.
2011-01-31 21:53:05 +02:00
Uoti Urpala 4ea60a3d0e options: mark -fs with CONF_NOSAVE to keep state between files
Most of the time users want to keep current fullscreen state when
switching to another file, rather than always resetting to the global
default that was determined when the command line was parsed. Add the
CONF_NOSAVE flag to the -fs option to achieve this. The change means
that the fullscreen state from the previous file is kept unless there
is an explicit file-specific -fs or -nofs setting for the new file
(or in case file groups are used, moving to the new file enters a
group with explicitly specified state).
2011-01-31 21:15:59 +02:00
Uoti Urpala f923fd720c options: remove unused "func_full" option type
vo_zr was the last user of the "func_full" option type. I think it's
better if future features are implemented using more straightforward
option functionality. Delete the func_full implementation.
2011-01-31 16:03:11 +02:00
Uoti Urpala 626d5ed628 vo_zr2: drop Zoran support
There were multiple files specific to Zoran support, and they also
depended on internal FFmpeg headers (so it would probably have been
hard to get them to compile now even if you tried). It's obsolete now,
so just drop the whole mess.
2011-01-31 16:03:11 +02:00
Uoti Urpala b138ca43ca vo_dxr2, ao_dxr2: drop dxr2 support
dxr2 support had been broken quite a while and nobody noticed. There
were finally commits to fix it in the svn repo, but rather than apply
those I'll just drop dxr2 support.
2011-01-31 16:03:10 +02:00
Uoti Urpala 6d534cd3cb vidix: drop VIDIX support
By now VIDIX is too obscure to justify the amount of code and
complexity it requires in the sources. Although there is no pressing
need to drop it just now from a code point of view, I'll rather remove
it before release than release with VIDIX support and then drop it
later.

Some of the manpage mentions of VIDIX were in "this option supported
for these VOs" lists that looked outdated and failed to mention vdpau
for example. Replace such incorrect lists with a generic "not
supported for all VOs" mention.
2011-01-31 16:03:10 +02:00
Uoti Urpala 902289f2b3 translation: remove \r and \n from translated PAUSE string 2011-01-31 16:03:10 +02:00
diego c1dfa22eba cosmetics: configure: Drop leading underscore from _need_* variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32816 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 35ceaf8918 cache: suggest increasing cache size in the "not filling!" message
Change "cache not filling" warning to include a hint to increase the
cache size.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32815 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 1ff555e2ed configure: add return_check and return_statement_check helpers
cosmetics: Move header_check helper function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32803 b3059339-0415-0410-9bf9-f77b7e298cf2

Add return_check() helper function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32805 b3059339-0415-0410-9bf9-f77b7e298cf2

Add return_statement_check() helper function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32806 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cboesch 5cb40ec42f mplayer.c: simplify code a bit, remove "main:" label
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32791 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cboesch 303865cb81 cleanup: vo_md5sum: Remove unused define/undef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32786 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 9cc34ca725 stream/http: assume MakeMKV webservers always support ranges
Add MakeMKV to list of webservers always supporting ranges even when
they claim otherwise.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32785 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix hack to check for MakeMKV server being inverted.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32807 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
siretart 65cc2366a3 TOOLS/: minor fixes in tool code
Fix printf format string warning

fixes this warning:
asfinfo.c: In function 'print_video_header':
asfinfo.c:158: warning: format '%.4s' expects type 'char *', but argument 3 has type 'long int *'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32774 b3059339-0415-0410-9bf9-f77b7e298cf2

add missing fclose

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32775 b3059339-0415-0410-9bf9-f77b7e298cf2

add missing fclose()

found by cppcheck:
[avisubdump.c:199]: (error) Resource leak: f

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32776 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos 9a021242a9 codecs.conf, vd_ffmpeg: Enable fflagarith video decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 659c500084 ao_coreaudio: fix compilation on OS X 10.4.
This version is the last OS version available for certain classes of
PPC Macs, but it lacks AudioDeviceIOProcID, so it has to be emulated.

patch by Aaro Koskinen, aaro.koskinen iki fi

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32770 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
compn d1d8892fdf DOCS/tech/codecs.conf.txt: add notes about BE/LE colorspaces
Add some notes about BE/LE colorspaces and fix a small typo.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32769 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos 5937ee8a5b codecs.conf: add format id for FLAC in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32767 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
ranma 1c37a03ac6 libmpdemux/mf.c: Don't hardcode filename length
Use limits.h to get the maximum length instead of hardcoding it.
Original patch by Sang-Uok Kum.

Signed-off-by: Tobias Diedrich <ranma@google.com>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32766 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cehoyos 2ce17b5afd codecs.conf: Fix playback of ffv1 yuv422p16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32764 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 359e85c234 osdep: tweak some #includes
Add/remove a few standard header #includes in osdep files.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32762 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 6bed5460eb configure: Define _XOPEN_SOURCE to 600 in mkstemp check
Define _XOPEN_SOURCE to 600 instead of 500 in mkstemp check, this is
consistent to the use in libavcodec, consistent with other
_XOPEN_SOURCE defines in tests and it fixes detection on Solaris that
refuses to compile system headers when combining std=c99 with
_XOPEN_SOURCE 500.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32759 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego af0e2107b2 configure: add define_statement_check function
Add define_statement_check function and use it to simplify some checks.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32758 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify a bunch of configure checks with the statement_check function.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32760 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
reimar 23fdd9463c stream/tvi_v4l2.c: simplify by using getfps helper function
Use getfps helper function everywhere, simplifies code and avoids a
possible division by 0.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32755 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
diego 52ba5ea684 example.conf: Disambiguate remarks about profiles
Also move the profiles to the bottom of the example configuration file
as the original remarks in the file suggested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00
cboesch 74c285e090 cleanup: define ROUND() macro in mpcommon.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32751 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:03:10 +02:00