summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Finally replace get_uint?? by AV_RL??reimar2007-12-011-35/+31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25234 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of annoying, space-wasting sizeof(uint32_t)reimar2007-12-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bigendian fix for ogg in AVIreimar2007-12-011-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25232 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a loop instead of doing the same thing three timesreimar2007-12-011-14/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25231 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a pointer variable for extradata to simplify init_avi_with_oggreimar2007-12-011-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25230 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set sh_video->format when parsing aviheader, otherwise it might neverreimar2007-12-011-0/+1
| | | | | | | be set correctly when using demux_demuxers (like with ogg stream in AVI). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25229 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some pointless castsreimar2007-12-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25228 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create correct extradata for vorbis audio when used as avi sub-demuxerreimar2007-12-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25227 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some typos in comments, grammar is still bad.reimar2007-12-011-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix typos in comments to stop them hurting my eyesreimar2007-12-011-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplifymichael2007-11-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25221 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable -rtsp-port for nemesilu_zero2007-11-271-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25184 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bring (de)muxer_lavf up to date with the libavformat API changes introduced ↵iive2007-11-232-5/+5
| | | | | | | | | | | by FFmpeg commit r11071. Patch for demuxer_lavf.c by Chris Welton - electrostatic_1 at yahoo Patch for muxer_lavf.c by me. Approved by michaelni. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25145 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable Theora supportlu_zero2007-11-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation error.iive2007-11-221-1/+1
| | | | | | | | | FFmpeg commit r11071 removed the static ByteIOContext from AVFormatContext and replaced it with a dynamic one. Thus muxer_lavf.c needs to be modified to reflect the change. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25135 b3059339-0415-0410-9bf9-f77b7e298cf2
* AAC support (aac-hbr only)lu_zero2007-11-211-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25132 b3059339-0415-0410-9bf9-f77b7e298cf2
* Media Format to fourcc conversion (from amol)lu_zero2007-11-211-22/+42
| | | | | | | Factorize out some if clauses git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25131 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function write_psm_block(), fixes the warning:diego2007-11-211-19/+0
| | | | | | | muxer_mpeg.c:763: warning: 'write_psm_block' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25126 b3059339-0415-0410-9bf9-f77b7e298cf2
* Musepack SV8 lavc decoder supportkostya2007-11-201-0/+1
| | | | | | | Patch okayed by Diego on IRC git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25120 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, fix uint32_t* instead of uint32_t typo in demux_mf type->fourcc tablereimar2007-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25090 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a pointless #ifdefreimar2007-11-171-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25062 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace if-else constructs for type -> fourcc mapping by a table in demux_mfreimar2007-11-171-13/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print warning about encrypted audio tracksrtogni2007-11-151-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25055 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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
| | | |