summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* bstr.[ch]: add new files for struct bstr related functionalityUoti Urpala2010-05-203-9/+5
| | | | | | | | 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.
* Merge svn changes up to r31141Uoti Urpala2010-05-071-1/+1
|\
| * cosmetic: typo, this wasn't supposed to be pluralaurel2010-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31137 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31133Uoti Urpala2010-05-072-19/+41
|\|
| * print a more detailed and more useful description of each stream with lavfaurel2010-05-031-6/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: correctly use video_stream instead of audio_stream in the video sectionaurel2010-05-031-2/+2
| | | | | | | | | | | | | | ( copy&paste error :( ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31131 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add ID_..._NAME to -identify for each lavf stream which has a titleaurel2010-05-031-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31130 b3059339-0415-0410-9bf9-f77b7e298cf2
| * uniformize handling of aid and vid with lavf so that it matches handling of sidaurel2010-05-031-14/+10
| | | | | | | | | | | | | | | | | | aid and vid are now 0-based, instead of being a globally unique id. This matches the way sid is handled and the way other demuxers manage aid. As a side effect, it slightly simplifies demux_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31129 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Silence permanent warning messages when decoding H264 over rtsp withcehoyos2010-05-021-1/+6
| | | | | | | | | | | | | | | | | | live555. Patch by Gil Pedersen, gil A cmi D aau D dk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Continue probing even for score == AVPROBE_SCORE_MAX / 4 to matchreimar2010-05-011-1/+1
| | | | | | | | | | | | | | FFmpeg's behaviour. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use av_probe_input_format2 and avoid accepting detectionreimar2010-05-011-2/+5
| | | | | | | | | | | | | | while the score is still low. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31110 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_y4m: fix failure with nonseekable inputUoti Urpala2010-04-301-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Playback of nonseekable y4m streams was broken by a change merged from svn, r30970 which added support for multiple yuv4mpeg files concatenated together. The change included a stream_skip(stream, -1) call which only works for seekable files. Work around this by disabling the concatenated-file check for nonseekable streams. This means concatenated files are only supported if the stream is seekable, but this is an improvement compared to the svn commit which caused a regression making _all_ files fail in the nonseekable case. It would be reasonably easy to make the concatenation support work in all cases, either by modifying demux_y4m or (probably better) adding a general stream API to allow pushing back the read byte. However for now I'm only fixing the regression with the above trivial change.
* | Merge svn changes up to r31050Uoti Urpala2010-04-261-1360/+1437
|\|
| * Merge two redundant if checks, patch by ubitux, ubitux gmail com.diego2010-04-161-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31042 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: reindent demux_ogg.c to K&R style plus some prettyprintingdiego2010-04-161-1360/+1438
| | | | | | | | | | | | | | patch by ubitux, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31041 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31004Uoti Urpala2010-04-263-3/+3
|\|
| * Mark muxer-related m_option_t arrays as const.diego2010-04-042-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make audio switching with AVI demuxer chose the first audio streamreimar2010-03-311-1/+1
| | | | | | | | | | | | | | if audio is disabled instead of ignoring the request. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30972Uoti Urpala2010-04-261-12/+28
|\|
| * Support concatenated YUV4MPEG files.reimar2010-03-271-11/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30970 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of malloc+memsetreimar2010-03-271-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30969 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-262-16/+18
|\|
| * 100l, fix frametime calculation for MPEG-2 files with frame rate extension.reimar2010-03-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30966 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2010-03-221-13/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30947 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Start probing with a size matching the stream buffer size so it is possiblereimar2010-03-221-2/+4
| | | | | | | | | | | | | | to restart without seeking even without cache for easily detectable formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30946 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30907Uoti Urpala2010-04-262-4/+12
|\|
| * Calculate width and height in mp4_header_process_vop().cehoyos2010-03-152-0/+9
| | | | | | | | | | | | | | Fixes elementary streams with -vc ffodivxvdpau and the native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30904 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix value of bit counter at end of functions to prepare for future patches.cehoyos2010-03-151-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Fix chapter handling with first chapter not at beginning of fileUoti Urpala2010-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | Before "-chapter 1" did nothing even if the first chapter didn't start at the beginning of file. Fix it. Before all chapter property commands (including chapter seek keys) failed if the current playback position was before the start of the first chapter. Now they'll work. Relative chapter seeks will go to the first chapter (even if that's in the wrong direction for backward seeks).
* | demux_mkv: fix verbose output of chapter numberingUoti Urpala2010-04-251-1/+1
| | | | | | | | The "Chapter N from..." lines printed with -v used wrong N.
* | demux_lavf, stream_ffmpeg: support librtmp seeksUoti Urpala2010-04-231-4/+21
| |
* | stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streamsUoti Urpala2010-04-231-5/+7
| | | | | | | | | | | | | | | | | | | | Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting generic format probing handle this could work, but with the current probing implementation it'd at least depend on not-really-guaranteed details of the stream layer (probing different formats and then decoding depends on seeking back in between; rtmp streams don't support such seeking directly so would need to rely on details of caching behavior).
* | options: move lavfdopts to option structUoti Urpala2010-04-231-27/+28
| |
* | demuxer.c: clean up stream-seek codeUoti Urpala2010-04-231-22/+29
| | | | | | | | | | | | | | | | | | Only try to use the dvd/dvdnav stream seek hack with those stream types. Generally demuxers can not be expected to cope with the stream suddenly seeking under them. In principle it would be more correct to make the test demuxer-based (instead of assuming that using stream seeks in this manner is OK with whatever demuxer that will be used with these streams), but that'd be more work.
* | Move some sh_audio field setting out of demuxer.cUoti Urpala2010-04-231-2/+0
| | | | | | | | These fields are decoder details, not information set by the demuxer.
* | Move seek-reset functionality out of demuxer.cUoti Urpala2010-04-231-37/+0
| | | | | | | | | | | | | | Move code for resetting decoders after seeks, chapter seeks and angle changes out of demuxer.c. This functionality belongs on a higher level; the demux layer can't always know what kind of reinitialization is required.
* | demux_mkv: Fix problem with compressed subtitle private dataUoti Urpala2010-03-211-10/+12
| | | | | | | | | | | | | | Convert demux_mkv_decode() to allocate possible new storage with talloc and fix a talloc/malloc conflict in demux_mkv_open_sub() that broke decoding of files which had a subtitle track with compressed private data.
* | Delete things related to old translation systemUoti Urpala2010-03-1042-42/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30879Uoti Urpala2010-03-101-2/+3
|\|
| * Return MP_NOPTS_VALUE if we can't figure out the pts, not 0.reimar2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30879 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve handling of 0-size ogg packets.reimar2010-03-091-1/+2
| | | | | | | | | | | | | | Fixes bug 1664. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30878 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30876Uoti Urpala2010-03-101-0/+1
|\|
| * Fix alpabetical order.cehoyos2010-03-091-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30876 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support SEGA CRI adx codec with demuxer lavf.cehoyos2010-03-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30875 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Increase mplayer buffer padding size to match the new one from ffmpeg.iive2010-03-071-1/+1
| | | | | | | | | | | | | | Allows compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30860 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30798Uoti Urpala2010-03-104-27/+4
|\|
| * Remove unused static function mp_mp3_get_lsf().cehoyos2010-02-271-12/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30774 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless #ifdef checks for DEMUXER_H, which is never set.diego2010-02-272-5/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30759 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary stream.h #includes.diego2010-02-272-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30758 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation of C++ source files (partly reverts r30744).cehoyos2010-02-271-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30755 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename "codecs_st" struct to just plain "codecs".diego2010-02-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30752 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30748Uoti Urpala2010-03-1010-27/+26
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-269-26/+25
| | | | | | | | | | | | | | | | These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add cast to proper type.reimar2010-02-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30738 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30732Uoti Urpala2010-03-103-0/+19
|\|
| * Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in atack2010-02-223-0/+19
| | | | | | | | | | | | | | wave file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30694Uoti Urpala2010-03-101-0/+1
|\|
| * Declare public function print_vprp() in aviprint.h.diego2010-02-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30694 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop weird and unnecessary _s/_st suffixes from demuxer struct names.diego2010-02-214-20/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add names to anonymous structs sh_common, sh_audio, sh_video, sh_sub.diego2010-02-211-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30685 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30683Uoti Urpala2010-03-104-5/+16
|\|
| * Fix fps output with -identify when frame rate extension is used for MPEG-2reimar2010-02-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30683 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize frame rate extension fields in mp_header_process_sequence_headerreimar2010-02-211-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30682 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Parse and use the information from the frame rate extension header for MPEG-2.reimar2010-02-213-4/+11
| | | | | | | | | | | | | | | | -identify still does not show the right values though. Fixes bug #1636. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg suppo