aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Skip svn changes r31177, r31178Gravatar Uoti Urpala2010-05-30
|\ | | | | | | Internal FFmpeg build stuff.
* \ Merge svn changes up to r31176Gravatar Uoti Urpala2010-05-30
|\ \
* \ \ Skip svn changes r31170, r31171Gravatar Uoti Urpala2010-05-30
|\ \ \
* \ \ \ Merge svn changes up to r31169Gravatar Uoti Urpala2010-05-30
|\ \ \ \
* \ \ \ \ Merge svn changes up to r31145Gravatar Uoti Urpala2010-05-30
|\ \ \ \ \
* | | | | | cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Gravatar Uoti Urpala2010-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 defaultGravatar Uoti Urpala2010-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 invalidGravatar Uoti Urpala2010-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 handlingGravatar Uoti Urpala2010-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changeGravatar Uoti Urpala2010-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 -nosoundGravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]_streamsGravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 switchingGravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 filesGravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 structGravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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()Gravatar Uoti Urpala2010-05-22
| | | | | | | | | | | | | | | | | | | | | | | | Also remove a redundant stream->eof = 0 in demuxer.c.
* | | | | | demux_mkv: read tags.Gravatar Anton Khirnov2010-05-22
| | | | | |
* | | | | | demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter()Gravatar Anton Khirnov2010-05-22
| | | | | |
* | | | | | demuxer.c: add demux_info_add_bstr(), use talloc for info fieldGravatar Anton Khirnov2010-05-21
| | | | | | | | | | | | | | | | | | | | | | | | demux_info_add() is now a wrapper around demux_info_add_bstr().
* | | | | | bstr.[ch]: add new files for struct bstr related functionalityGravatar Uoti Urpala2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | subreader.c: allow compilation with old FriBiDi 0.10Gravatar Uoti Urpala2010-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After fixing the type of the third parameter given to fribidi_log2vis the code didn't compile with old FriBiDi 0.10 any more. Seems that the parameter type has changed in FriBiDi and the type expected by current versions didn't exist in older ones at all. Fix compilation with old FriBiDi by adding an #if based on FRIBIDI_INTERFACE_VERSION.
* | | | | | ad_pcm: don't rely on demux packets staying validGravatar Uoti Urpala2010-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ad_pcm to copy input packet data into an internal buffer instead of relying on the packet still existing at the next decode() call. The extra memcpy could be avoided by improving the demuxer API a bit but I don't feel like implementing that now. Also add a ADCTRL_RESYNC_STREAM handler to drop buffered data from previous stream position.
* | | | | | ad_pcm: fix crash at EOFGravatar Uoti Urpala2010-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix use of unsigned type where negative values were needed. When playing a file with multichannel PCM audio the bug could result in the channel reorder function scrambling memory at the end of playback, causing a crash.
* | | | | | cosmetics: reindent ad_pcm.cGravatar Uoti Urpala2010-05-15
| | | | | |
| | | | | * vf_zr requires the lavc MJPEG encoder even when MEncoder has been disabled.Gravatar diego2010-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation with vo_zr enabled and MEncoder disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31178 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | * Remove duplicate and nonsense libavencoders #define for OpenCORE AMR-WB.Gravatar diego2010-05-14
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenCORE AMR-WB only has a decoder, no encoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31177 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Check for termios.h before sys/termios.h.Gravatar diego2010-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar cehoyos2010-05-14
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * Fix compilation after r31173.Gravatar cehoyos2010-05-14
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | * remove vf_yuy2, functionality is replaced by -vf format=yuv2Gravatar siretart2010-05-14
| | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | | | vo_vdpau: support queuing an arbitrary number of frames aheadGravatar Uoti Urpala2010-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the number of output surfaces allocated by vo_vdpau configurable and allow queuing multiple future frames with the VDPAU frame timing functionality. There are two known issues that could be polished in the future for particularly long queue time cases. First, toplevel code should possibly wait for the queued changes to finish displaying in some situations like switching files. Second, the VO can block waiting for a surface to become available, and in the worst case this wait can be almost as long as the maximum queuing time (potentially causing audio underruns). However those issues are not high priority.
* | | | | af_lavcac3enc: make the filter work without FFmpeg internalsGravatar Uoti Urpala2010-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only FFmpeg internal symbols required were some constants. Define them in the file itself instead. Also add some checks and fixes to make the code more robust and fix a potential memory corruption problem.
| | | | * Silence a gcc warning about char trying to be packed.Gravatar cehoyos2010-05-13
| | | |/ | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31172 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | * move 'dvdsublang... moviename en,eng,' message to debug level.Gravatar compn2010-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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:Gravatar ramiro2010-05-12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Mention removal of internal liba52 copy in Changelog.Gravatar diego2010-05-12
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31169 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | vo_vdpau: add option for studio level outputGravatar Uoti Urpala2010-05-12
| | | | | | | | | | | | | | | | | | | | | Add -vo vdpau suboption "studio" to produce output in RGB range 16-235. Man page description mostly taken from a patch by Lauri Mylläri (but not code). Also slightly tweak the description of two other suboptions on the man page.
| | * 10l: Use the directory part of the stylesheet path to create a directory.Gravatar diego2010-05-11
| | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31167 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Create output directory when copying stylesheet.Gravatar diego2010-05-11
| | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | | | | | | | | | | | | | 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-*.Gravatar diego2010-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31161 b3059339-0415-0410-9bf9-f77b7e298cf2
| | * Make XML documentation build process nonrecursive.Gravatar diego2010-05-11
| | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2010-05-11
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31156 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-19 20:16:15 +0000