summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* add tif support to demux_mfcompn2007-11-141-0/+2
| | | | | | | ok'd by diego and reimar git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25048 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for second stream presence, fixes single stream playback (from amol)lu_zero2007-11-131-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25041 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l video != audiolu_zero2007-11-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25040 b3059339-0415-0410-9bf9-f77b7e298cf2
* support extradata for audio streamslu_zero2007-11-131-4/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25039 b3059339-0415-0410-9bf9-f77b7e298cf2
* fetch metadata for audio (from amol)lu_zero2007-11-131-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25038 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert stray commit r25027lu_zero2007-11-131-22/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25037 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for second stream presence, fixes single stream playback (from amol)lu_zero2007-11-131-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25034 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l video != audiolu_zero2007-11-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25030 b3059339-0415-0410-9bf9-f77b7e298cf2
* support extradata for audio streamslu_zero2007-11-121-5/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25029 b3059339-0415-0410-9bf9-f77b7e298cf2
* fetch metadata for audio (from amol)lu_zero2007-11-121-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25028 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for mpeg4video-es (from dario)lu_zero2007-11-121-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25027 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix forcefps (from amol)lu_zero2007-11-121-4/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25026 b3059339-0415-0410-9bf9-f77b7e298cf2
* Refactor demux_nemesi (from amol)lu_zero2007-11-121-61/+71
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25025 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix typo in error messagereimar2007-11-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24976 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentednicodvb2007-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24974 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, setting a non-existent timestamp (default 0.0) when the pts flag isn't ↵nicodvb2007-11-051-0/+1
| | | | | | | | | set in the PES header is just wrong; leave the default MP_NOPTS_VALUE instead git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24973 b3059339-0415-0410-9bf9-f77b7e298cf2
* in video_read_frame() set the keyframe flag in demuxer->video when dealing withnicodvb2007-11-021-0/+2
| | | | | | | VIDEO_MPEG12 and picture_coding_type==I_FRAME; fixes seeking in avi streams with MPEG1/2 video git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24940 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent unlikely memleaknicodvb2007-11-021-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24938 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, priv->use_psm can be 1 only if the format is genmpeg2nicodvb2007-11-021-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24937 b3059339-0415-0410-9bf9-f77b7e298cf2
* add streams to the PSM only if priv->use_psm is set, otherwise the muxer wouldnicodvb2007-11-021-1/+1
| | | | | | | write the map also for ordinary mpeg audio and video streams (wasting space) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24936 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the decision of the necessity of the PSM based on ↵nicodvb2007-11-021-2/+3
| | | | | | the format of the video stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24935 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed no more needed variablenicodvb2007-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24934 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to fix_parameters() the code that decides if the PSM is needednicodvb2007-11-021-11/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24933 b3059339-0415-0410-9bf9-f77b7e298cf2
* repeat the PSM once every second (in terms of delta_scr) otherwise playing ↵nicodvb2007-11-021-0/+23
| | | | | | the file from the middle would miss the first instance git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24932 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove the registration descriptor from the PSM: writing the fourcc in it ↵nicodvb2007-11-021-7/+2
| | | | | | makes it total crap git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24931 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100% cosmetics: reformatted with tabs and symmetric braces and removed ↵nicodvb2007-11-021-319/+324
| | | | | | useless braces and trailing tabs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24930 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up some fields in stheader.h structsuau2007-11-011-3/+2
| | | | | | | | | | | | | | sh_video_t: void *video_out: only assigned to, never read. Remove. sh_video_t: void *vfilter: change type to struct vf_instance_s * sh_audio_t: void *afilter: change type to struct af_stream_s * The latter two never hold different types so there's no reason to use void *. Maybe they were originally defined that way because the option of using pointers to incomplete struct types was missed (the typedefs vf_instance_t and af_stream_t would require extra headers)? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable:diego2007-10-301-1/+1
| | | | | | | demux_lavf.c:441: warning: unused variable 'g' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24896 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable function that is only used in disabled code, fixes warning:diego2007-10-301-0/+2
| | | | | | | yuv4mpeg.c:147: warning: 'y4m_snprint_xtags' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24887 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix fps guessinglu_zero2007-10-291-3/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24884 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update to use newer libnemesi, should fix desync, fps guessing may fail nowlu_zero2007-10-291-10/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24883 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed silly #if 1nicodvb2007-10-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24878 b3059339-0415-0410-9bf9-f77b7e298cf2
* DEMUXER_TYPE_TV is always defined, thus removed corresponding #ifdef USE_TV.nicodvb2007-10-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24877 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindented previously modified codenicodvb2007-10-271-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24876 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_IDENTIFY_PROGRAM to permit program switchingnicodvb2007-10-271-0/+54
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24873 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit identification and selection of programsnicodvb2007-10-271-0/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24872 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit the transititions no stream <-> some streams and viceversa (needed ↵nicodvb2007-10-271-3/+11
| | | | | | for forthcoming program switching patch) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24871 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to a new function handle_stream() the code to parse the streams and ↵nicodvb2007-10-271-111/+115
| | | | | | assign the demuxer_streams git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24870 b3059339-0415-0410-9bf9-f77b7e298cf2
* in process_userdata() move debugging messages from stdout to stderrnicodvb2007-10-271-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24867 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed funny calls to fflush(stdout) after mp_msg()nicodvb2007-10-271-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24866 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed more empty spaces and empty linesnicodvb2007-10-271-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24865 b3059339-0415-0410-9bf9-f77b7e298cf2
* replaced giant if() with if(pre-calculated variable) (there was even a bug: ↵nicodvb2007-10-271-5/+1
| | | | | | PS doesn't necessarily contain mpeg12) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24864 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: removed tabs/empty lines/trailing spaces and done a partial ↵nicodvb2007-10-271-82/+72
| | | | | | reformatting where desperately needed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24862 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: moved to function find_video_codec() and reused in video_read_*() ↵nicodvb2007-10-271-45/+42
| | | | | | the code that identifies the various mpeg* formats git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24860 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Remove useless codeuau2007-10-251-21/+17
| | | | | | | | Remove "while(1) { }" around two instances of code that always do "return" in the loop body. No functionality changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for wavpack into matroskaaurel2007-10-212-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24833 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused code and fix warning:diego2007-10-211-14/+0
| | | | | | | demux_real.c:147: warning: 'skip_str' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24827 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark constant argument of mp_header_process_sequence_header as such.diego2007-10-192-2/+2
| | | | | | | | | fixes warning: vd_mpegpes.c: In function 'decode': vd_mpegpes.c:49: warning: passing argument 2 of 'mp_header_process_sequence_header' discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24812 b3059339-0415-0410-9bf9-f77b7e298cf2
* add nellymoser codec to mplayer with internal fourcc NELLcompn2007-10-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24792 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add -lavfdopts cryptokeyreimar2007-10-141-0/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24785 b3059339-0415-0410-9bf9-f77b7e298cf2
* support Y800 in raw videodiego2007-10-131-0/+1
| | | | | | | patch by Attila Ötvös, oattila chello hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24768 b3059339-0415-0410-9bf9-f77b7e298cf2
* in update_stats() removed a wrong 'else' that would prevent h264 headers to ↵nicodvb2007-10-041-1/+1
| | | | | | | | | | be recognized: all 0x12x headers were accounted for only in num_elementary_packets12x. Fixes detection of certain H264 in ES/PS streams git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24701 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix missing subtitles after seeking backuau2007-10-041-0/+1
| | | | | | | | | | | | | | Subtitle packets that had been demuxed but whose start time had not yet been reached were left in the demuxer stream after seeking. When using the default (non-libass) subtitle rendering this could block subtitles from appearing as long as the playback position stayed below the original one before seek. External subtitle files were not affected. Fixed by making seek code free all packets from the subtitle stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for DTS as specified in DVB (untested)nicodvb2007-10-031-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24696 b3059339-0415-0410-9bf9-f77b7e298cf2
* Format 0x01 cannot be used with "AMV IMA ADPCM", because it belongs to ↵voroshil2007-10-031-0/+2
| | | | | | | | | | normal PCM. Make lavf demuxer set codec tag to AMVA in this case. No need to use -ac +ffadpcmimaamva anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24694 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set biWidth/biHeight in fli demuxerreimar2007-10-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24688 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure there is no uninitialized data in BITMAPINFOHEADER created by fli ↵reimar2007-10-021-1/+1
| | | | | | demuxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24687 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove ugly unused struct name from typedefreimar2007-10-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24686 b3059339-0415-0410-9bf9-f77b7e298cf2
* AMV demuxer and audio/video decodervoroshil2007-09-301-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24673 b3059339-0415-0410-9bf9-f77b7e298cf2
* analyzeduration option for lavf demuxerhenry2007-09-291-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24655 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove useless int->double conversionhenry2007-09-291-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24654 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix warningshenry2007-09-291-1/+1
| | | | | | | | | demux_lavf.c: In function ‘demux_open_lavf’: demux_lavf.c:276: warning: assignment discards qualifiers from pointer target type demux_lavf.c:280: warning: assignment discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24653 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed bug introduced with previous commit: patch_panscan() must work in the ↵nicodvb2007-09-281-1/+1
| | | | | | sequence_display_extension, not on se_ptr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24651 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l, the tff flag was never cleared before being overwritten with the ↵nicodvb2007-09-281-2/+4
| | | | | | | | | | | value on bff_mask; also, the sequence extension pointer was set to point to the sequence_display_extension, so the progressive_sequence was never set and the sde was being corrupted patch by Christopher Montgomery (xhiphmont xiph org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24650 b3059339-0415-0410-9bf9-f77b7e298cf2
* h263 exposedlu_zero2007-09-281-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix playback of streams with more than one audio track (only one supported).cehoyos2007-09-251-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: initialize at declaration at the start of the functionreimar2007-09-241-10/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24612 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of rather pointless assertsreimar2007-09-241-12/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24611 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_audio.c: Fix timestamp handlinguau2007-09-241-14/+15
| | | | | | | | | | | | | | | | | | The code calculated the pts values of audio packets by adding the length of the current packet to the pts of the previous one. The length of the previous packet should be added instead. This broke WAV timestamps near the end of the stream where a short packet occurs. Change the code to store the pts of the next packet instead of the last one. This fixes the WAV timestamps and allows some simplifications. MP3 timestamps are not affected as packets are always treated as constant decoded length, and FLAC timestamps still have worse problems (FLAC is treated as as if it was constant bitrate even though it isn't). Also store the timestamps as double instead of float. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24609 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused function parametersnicodvb2007-09-221-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24590 b3059339-0415-0410-9bf9-f77b7e298cf2
* in ts_detect_streams() moved the iteration condition inside the loopnicodvb2007-09-221-1/+4
| | | | | | | | because it depends on the updated value of stream_tell(); (fixes infinite wait on enctrypted TS streams) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24589 b3059339-0415-0410-9bf9-f77b7e298cf2
* libnemesi support, yet another rtsp/rtp library...lu_zero2007-09-194-1/+487
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add comment that clears up what _WINGDI_H is for.diego2007-09-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24570 b3059339-0415-0410-9bf9-f77b7e298cf2
* reverted useless r24539ben2007-09-151-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24540 b3059339-0415-0410-9bf9-f77b7e298cf2
* added monkey audio fourcc in wave headerben2007-09-151-0/+1
| | | |