summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_lavf.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30663Uoti Urpala2010-03-101-1/+1
|\ | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Print all 64 bits of seek position.reimar2010-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30662 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-101-3/+1
|\|
| * Add header for AVI print functions; avoids many forward declarations.diego2010-02-181-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30550Uoti Urpala2010-03-091-6/+18
|\|
| * Dynamically increase probe size for lavf demuxer up to 2 MB.reimar2010-02-121-6/+18
| | | | | | | | | | | | | | | | | | | | This will read progressively more data if we still did not detect the format. The lavfpref demuxer is unaffected to avoid hanging for a long time in case of a slow network stream that some native demuxer may be able to handle. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30547 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30502Uoti Urpala2010-03-091-6/+12
|\| | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
| * Replace incorrect usage of strncpy.reimar2010-02-031-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2010-02-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.reimar2010-02-031-4/+9
| | | | | | | | | | | | | | ffmpeg://rtsp://... will play a rtsp stream via FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.cehoyos2009-12-281-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert r30100: It breaks some mov and asf samples.cehoyos2009-12-281-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.cehoyos2009-12-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux: take chapter/attachment name strings without 0-terminationUoti Urpala2010-01-271-3/+3
| | | | | | | | | | | | | | | | | | Change the demuxer_add_attachment() and demuxer_add_chapter() functions to take a length argument for various name strings, so those strings do not need to be 0-terminated. This will make it easier to directly pass demuxed data without first making a copy just to add 0-termination. Also allocate the struct demuxer data structures for attachments and chapters with talloc.
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-6/+5
|\|
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-221-1/+1
| | | | | | | | | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
| * av_alloc_format_context -> avformat_alloc_contextreimar2009-11-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse buffer in priv context instead of allocating the 32kB probe bufferreimar2009-11-221-4/+3
| | | | | | | | | | | | | | on the stack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-28/+13
|\|
| * Allow lavf demuxer to also probe and play files < 32 kB (full probe buffer ↵reimar2009-11-101-2/+4
| | | | | | | | | | | | | | | | | | size). Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29882 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.cehoyos2009-11-071-0/+2
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless and broken (e.g. does not set aid and vid) -tsprog handlingreimar2009-11-071-22/+3
| | | | | | | | | | | | | | | | from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the right arguments, and that code actually works in contrast to the one in demux_open_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove an empty program if the one requested by IDENTIFY_PROGRAM does not existreimar2009-11-071-4/+4
| | | | | | | | | | | | | | instead of incorrectly claiming that the demuxer does not support programs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29845 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-1/+4
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * lavf: if seeking in the desired direction failed, also try in the opposite one,reimar2009-09-301-1/+4
| | | | | | | | | | | | | | | | otherwise we might end up at some random position (where lavf last ended up while trying to build the index). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29684Uoti Urpala2009-09-161-13/+15
|\|
| * Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectlyreimar2009-09-101-0/+1
| | | | | | | | | | | | | | | | claims the Wave64 files but can not handle them). Patch by Daniel Verkamp [daniel drv nu]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sort preferred_list alphabetically since the order does not matter otherwise.reimar2009-09-101-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead ofreimar2009-09-081-2/+0
| | | | | | | | | | | | | | reimplementing that functionality. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix an endless loop if all programs are empty.reimar2009-09-081-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29660 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Always register all streams from libavformat, not just those belonging to a ↵reimar2009-09-081-5/+3
| | | | | | | | | | | | program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29657 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for lavf vqf demuxer and lavc TwinVQ decoder.vitor2009-09-071-0/+1
| | | | | | | | | | | | | | | | | | Also make lavf the default demuxer for vqf. Ok'ed by Compn on IRC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-6/+5
|\|
| * Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect thatcehoyos2009-08-301-1/+2
| | | | | | | | | | | | | | it now can be used for both audio and video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use mp_wav_override_taglists for both audio and video.cehoyos2009-08-301-6/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29590 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-10/+9
|\|
| * Use new libavformat metadata API.greg2009-08-111-10/+9
| | | | | | | | | | | | Patch by Anton Khirnov <wyskas@gmail.com>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29497 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Use own mp_*_taglists code instead of libavformat internalsUoti Urpala2009-07-261-3/+3
| | | | | | | | | | Use the version of code under ffmpeg_files/ instead of relying on libavformat source files to be available.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-20/+21
|\|
| * AVStream.language is deprecated, switch to av_get_metadata instead.reimar2009-06-241-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29386 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move allocation to avoid a possible memleak if new_sh_audio fails.reimar2009-06-241-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29385 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless stream count checks, new_sh_* already checks for that.reimar2009-06-241-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29384 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontendsreimar2009-06-241-2/+6
| | | | | | | | | | | | | | can correctly display the languages of audio and subtitle tracks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29383 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const where appropriate, also gets rid of a compiler warning.reimar2009-06-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29338 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, do not read probe buffer if it will not be used because a format was ↵reimar2009-06-011-6/+7
| | | | | | | | | | | | forced. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29337 b3059339-0415-0410-9bf9-f77b7e298cf2
| * In all demux_info_add calls change "name" to "title".reimar2009-05-301-1/+1
| | | | | | | | | | | | | | | | | | Currently "name" and "title" are both used at random, this makes it consistent. "title" was chosen because it is less ambiguous and also the get_meta_title slave mode command uses that (there is no get_meta_name command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-3/+3
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | demux_lavf: Make absolute seek time 0-based instead of file startUoti Urpala2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | demux_lavf interpreted absolute seeks as relative to the start of the file, so if the file didn't start at timestamp 0 then seeking to timestamp X went to a position MPlayer would display as start+X. Make the seeks use the same timestamps as used in the original file. This works better for most use cases as no part of MPlayer normally uses or displays such "since start of file" timestamp values. There could be some cases where the old semantics are useful, but I think they do not justify making it the default behavior; a separate feature for that could be added if it turns out to be needed.
* | Merge branch 'ordered_chapters'Uoti Urpala2009-04-081-0/+7
|\ \
| * | Add improved relative seek modeUoti Urpala2009-03-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the new mode is active relative seeks are converted to absolute ones (current video pts + relative seek amount) and forward/backward flag before being sent to the demuxer. This mode is used if the demuxer has set the accurate_seek field in the demuxer struct and there is a video stream. At the moment the mkv and lavf demuxers enable the flag. This change is useful for later Matroska ordered chapter support (and for more general timelime editing), but also fixes problems in existing functionality. The main problem with the old mode, where relative seeks are passed directly to the demuxer, is that the user wants to seek relative to the currently displayed position but the demuxer does not know what that position is. There can be an arbitrary amount of buffering between the demuxer read position and what is displayed on the screen. In some situations this makes small seeks fail to move backward at all (especially visible at high playback speed, when audio needs to be demuxed and decoded further ahead to fill the output buffers after resampling). Some container formats that can be used with the lavf demuxer do not always have reliable timestamps that could be used for unambiguous absolute seeking. However I made the demuxer always enable the new mode because it already converted all seeks to absolute ones before sending them to libavformat, so cases without reliable absolute seeks were failing already and this should only improve the working cases.
* | | Merge svn changes up to r29134Uoti Urpala2009-04-021-1/+1
|\ \ \ | |/ / |/| / | |/
| * Increase probe buffer size to 32kB, this makes ac3 auto-detection far more ↵reimar2009-04-011-1/+1
| | | | | | | | | | | | reliable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29121 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28341Uoti Urpala2009-01-191-1/+1
|\| | | | | | | | | | | Conflicts: configure libmpcodecs/native/rtjpegn.c
| * Fix compilation: s/ff_gcd/av_gcd.cehoyos2009-01-171-1/+1
| | |