summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r31176Uoti Urpala2010-05-308-114/+46
|\
| * Check for termios.h before sys/termios.h.diego2010-05-141-1/+1
| | | | | | | | | | | | | | The former location is the more current and standard variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31176 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable libavcodecs new MPEG-1 Audio float decoder.cehoyos2010-05-141-0/+39
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after r31173.cehoyos2010-05-141-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove vf_yuy2, functionality is replaced by -vf format=yuv2siretart2010-05-144-108/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Silence a gcc warning about char trying to be packed.cehoyos2010-05-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31172 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes r31170, r31171Uoti Urpala2010-05-300-0/+0
|\|
| * move 'dvdsublang... moviename en,eng,' message to debug level.compn2010-05-131-1/+1
| | | | | | | | | | | | | | | | | | change 'dvdsublang' to 'potential sub', subtitles werent always dvd related. also change output to only output selected subtitle. patch by ubitux at gmail. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31171 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert r31153. It failed to build on:ramiro2010-05-126-57/+55
| | | | | | | | | | | | | | | | | | | | | | | | x86_64 / Mac OS X gcc 4.0.1 x86_64 / Linux icc (all) x86_64 / Linux gcc 4.0.4 x86_64 / OpenBSD gcc 3.3.5 x86_64 / Linux suncc 5.10 and there are some reports of crashes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31170 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31169Uoti Urpala2010-05-3059-10208/+311
|\|
| * Mention removal of internal liba52 copy in Changelog.diego2010-05-121-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31169 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Use the directory part of the stylesheet path to create a directory.diego2010-05-111-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31168 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Invoke all shell scripts during XML documentation build directly.diego2010-05-111-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31167 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create output directory when copying stylesheet.diego2010-05-111-5/+3
| | | | | | | | | | | | | | This eliminates one rule and simplifies dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31166 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge both XML documentation README files into one.diego2010-05-112-21/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31165 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not run xmllint prior to building the XML documentation.diego2010-05-111-2/+2
| | | | | | | | | | | | | | | | xmllint is just a convenient way to check for syntax errors; it is not a requirement to build the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31164 b3059339-0415-0410-9bf9-f77b7e298cf2
| * XML docs: Make xmllint-* targets a dependency of html-chunked-*/html-single-*.diego2010-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | Since the xmllint-* targets are phony, they should never be a dependency of real targets, so make them a dependency of the phony html-chunked-* / html-single-* targets instead. This is just as correct, but now the docs are regenerated when dependencies change and not with every make invocation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31163 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only mark targets whose names end in "clean" as phony.diego2010-05-111-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31162 b3059339-0415-0410-9bf9-f77b7e298cf2
| * docs: Update documentation to account for recent build system changes.diego2010-05-111-13/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31161 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make XML documentation build process nonrecursive.diego2010-05-112-35/+12
| | | | | | | | | | | | | | This greatly simplifies the documentation build process and the Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31160 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless variable indirection for XSL stylesheets.diego2010-05-111-10/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdcss is now synced to a recent upstream Subversion snapshot.diego2010-05-112-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31158 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdcss: Fix potential format string crash; check RPC status on disc access.diego2010-05-112-11/+62
| | | | | | | | | | | | | | This merges upstream revisions 223 and 224 + 225. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdcss: OS/2 support; this merges upstream revisions 220 and 229.diego2010-05-114-8/+143
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31156 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdcss: cosmetics: Fix FSF address and program name in license headers.diego2010-05-1112-46/+46
| | | | | | | | | | | | | | This merges upstream revisions 219 and 221. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31155 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with --disable-fastmemcpy on x86astrange2010-05-111-1/+1
| | | | | | | | | | | | | | | | The inverse of a && b isn't !a && !b. Regression in r30728. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31154 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use int instead of long to pass width parameters in non-public functions.ramiro2010-05-116-55/+57
| | | | | | | | | | | | | | long was being incorrectly used as an x86-sized register, both for 32 and 64 bits, but this is not the case in win64. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31153 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Pass a language variable to submakes instead of reading subdirectory Makefiles.diego2010-05-1012-55/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Default to rectangle=1 on Mesa DRI R200 drivers, much faster and less buggy.reimar2010-05-091-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Minor code cleanup.reimar2010-05-091-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * yuv=5 supports brightness and contrast adjustment.reimar2010-05-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add FLV4 fourcc to vp6compn2010-05-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31148 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove internal liba52 copy.diego2010-05-0929-10022/+6
| | | | | | | | | | | | | | Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the system liba52 headers when internal liba52 is disabled, fixes:diego2010-05-091-0/+5
| | | | | | | | | | | | | | libmpdemux/muxer_mpeg.c:2121: warning: implicit declaration of function 'a52_syncinfo' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31146 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31145Uoti Urpala2010-05-304-295/+304
|\|
| * cosmetics: Drop leading underscore from some commonly-used variable names.diego2010-05-091-319/+319
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31145 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle Y8/Y800 formats more similar to other YUV formats.reimar2010-05-092-3/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31144 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle chroma texture size becoming 0, e.g. due to bad rounding.reimar2010-05-091-1/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31143 b3059339-0415-0410-9bf9-f77b7e298cf2
| * blackfin: fix yuv422 to yuv420 conversionmru2010-05-071-5/+12
| | | | | | | | | | | | | | | | The old code is correct only when stride = 2*width. Patch by Ronaldo Moura <ronaldo d moura monity com br> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31142 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-2995-390/+401
| | | | | | | | | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* | af_lavcac3enc: actually enable the filter by defaultUoti Urpala2010-05-261-3/+1
| | | | | | | | | | The filter was changed earlier to allow building without FFmpeg internal symbols. Make it actually available by default.
* | vo_vdpau: fix loop initializing output surfaces as invalidUoti Urpala2010-05-261-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The loop initializing handles in the output surface table to VDP_INVALID_HANDLE ran over indices from 0 to vc->num_output_surfaces. However it is first called before that variable is initialized. As a result later code could try to destroy the handles which still had the "non-invalid" value 0. Most likely this caused no visible effects; at least on my machine no valid surface gets handle 0, and libvdpau just returns an error for the resulting invalid calls. Change the code to loop over the whole table. Also add code to print visible warnings if libvdpau rejects a surface destroy call (some other places already had checks but not all).
* | demux_mkv: fix realvideo extradata handlingUoti Urpala2010-05-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The code handling larger-than-minimum realvideo extradata sizes was complete nonsense. It tried to add the additional data to the exported track extradata by reading data from the input stream, which was completely bogus as this code is called long after the original Matroska track extradata information has been read. As a result the data read had nothing to do with correct values, and the read call messed up the stream position which likely broke further parsing of the file and caused complete playback failure. Change the code to instead copy any additional part at the end of input extradata to the end of output extradata. I believe this is the intended semantics, though I haven't verified it from any specs.
* | demux_mkv: fix crash bug introduced by recent changeUoti Urpala2010-05-241-2/+2
| | | | | | | | | | | | | | Commit fc39d48465 ("demux_mkv: store streams sequentially in demuxer->[avs]_streams") had a simple bug in automatic stream selection causing a crash if no video or audio track was marked as 'default'. Fix.
* | demux_mkv: support switching to/from -nosoundUoti Urpala2010-05-221-18/+13
| | | | | | | | | | | | Allow audio stream switching to turn off sound or enable it, and also include nosound as one of the values cycled through when stepping to the next audio stream.
* | demux_mkv: store streams sequentially in demuxer->[avs]_streamsUoti Urpala2010-05-221-49/+55
| | | | | | | | | | | | | | | | | | demux_mkv used the Matroska TrackNumber as the array offset in demuxer stream lists. The TrackNumber entry stored in the file can be an arbitrary 64-bit value, and some of the code could try reading from the arrays with that offset, causing a crash if the file had insane values. Fill the arrays sequentially instead. Also add some checks to make the handling of too high stream counts more robust.
* | Make audio stream index handling saner in stream switchingUoti Urpala2010-05-223-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of audio stream numbering was handled in the stream selection property was a total mess. The most important issue was confusion between values used as index for demuxer->audio_streams[] array (consistently stored in demuxer->audio->id) and values stored in sh_audio->aid and used as "-aid N" option values. Now demuxer audio switch control functions and demuxer_switch_audio() are supposed to return the new value for the "-aid" option (internal MPEG demuxers still don't; the demuxer requirement could perhaps be dropped as it can be easily calculated afterwards). That is also the value returned for the "switch_audio" property. The main changes are: - Make command.c mp_property_audio() consistently use and return the "-aid" values. Before it used that as input but the array index as output, with extra mess related to demuxer_switch_audio() return value. Don't modify the audio_id option field any more. - Make demuxer_switch_audio() always return "-aid" values (like it takes as input). There are two changes for this: picking this return value in case the demuxer doesn't support switching, and overriding demuxer return value (for internal MPEG demuxers). - Make demux_lavf return "-aid" values from DEMUXER_CTRL_SWITCH_AUDIO code. This isn't actually necessary because of the override part above. Here's some history of the relevant behavior that I looked up: * For most demuxers array index and "-aid" values are the same. At least demux_mkv, (some of?) the internal MPEG demuxers and demux_ogg have differed for a long time. demux_ogg doesn't matter because it doesn't support stream switching. * Old code seemed to assume that demuxer_switch_audio() return value was array index, but this wasn't true at least for demux_mkv. * In svn r19951 reimar mostly removed use of the return value. * In r20162 ptt added mp_property_audio(). This set the global audio_id variable (-aid option value) to the return value of demuxer_switch_audio() and treated the global as the persistent value of the property, apparently assuming that it would be set to the "-aid" value, not array index. This was false for internal MPEG. * In r30124 reimar changed the property code so that even though it still modified the option value it didn't use that as the value of the property any more; instead it incorrectly used the array index. This meant that for demux_mkv the return value didn't match -aid any more (though input still did, so setting the property and querying it didn't match as they used different value systems). * In r31129 aurel made demux_lavf changes that resulted in its -aid and array index values no longer matching either. He didn't change the return value from audio switch when changing -aid, so it now matched array index only. The latter part didn't cause additional problems from r20162 though because either choice would have been broken anyway after r30124 as long as they weren't the same value.
* | core: apply audio track options to all ordered chapter filesUoti Urpala2010-05-221-1/+6
| | | | | | | | | | | | | | Options selecting audio track to play (-nosound, -alang, -aid) only affected the first source file. When you moved to a timeline part that came from another file the default audio track for that file was used. Add code to apply the options to all files.
* | options: move -alang and -slang to option structUoti Urpala2010-05-228-42/+41
| | | | | | | | | | | | | | The option field corresponding to -slang is now called "sub_lang" instead of the old misleading global name "dvdsub_lang". The code handling -slang in subreader.c looks rather broken; disable it instead of converting it to use the option field.
* | stream.h: remove bad EOF check in stream_seek()Uoti Urpala2010-05-222-3/+0
| | | | | | | | Also remove a redundant stream->eof = 0 in demuxer.c.
* | demux_mkv: read tags.Anton Khirnov2010-05-224-5/+86
| |
* | demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter()Anton Khirnov2010-05-224-29/+25
| |
* | demuxer.c: add demux_info_add_bstr(), use talloc for info fieldAnton Khirnov2010-05-212-15/+18
| | | | | | | | demux_info_add() is now a wrapper around demux_info_add_bstr().
* | bstr.[ch]: add new files for struct bstr related functionalityUoti Urpala2010-05-206-9/+96
| | | | | | | | | | | | | | | | Move "struct bstr" definition from ebml.h to its own header and add some utility functions/macros. Change length field type from int to size_t and adjust using code accordingly. Partially based on a patch from Anton Khirnov.