summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Unbreak audio, thanks to Uoti for the insightlu_zero2008-06-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable, fixes the warning:diego2008-06-081-1/+0
| | | | | | | libmpdemux/demux_ts.c:3130: warning: unused variable 'd_sub' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27036 b3059339-0415-0410-9bf9-f77b7e298cf2
* call demux_flush() where appropriatenicodvb2008-06-021-6/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26960 b3059339-0415-0410-9bf9-f77b7e298cf2
* use demux_flush() where appropriatenicodvb2008-06-021-6/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26959 b3059339-0415-0410-9bf9-f77b7e298cf2
* added and reused demux_flush() instead of emptying the demux_stream buffers;nicodvb2008-06-022-20/+11
| | | | | | | patch by Bryan Henderson - giraffedata gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26958 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initialize sh_audio/sh_video->dsreimar2008-05-271-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify/make new_sh behaviour more consistent when a stream gets redefined.reimar2008-05-271-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26907 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: simplifyreimar2008-05-271-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26906 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move native musepack demuxer further down in demuxer listreimar2008-05-271-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26905 b3059339-0415-0410-9bf9-f77b7e298cf2
* add qclp fourcccompn2008-05-261-0/+1
| | | | | | | | fixes http://samples.mplayerhq.hu/A-codecs/qclp/tube.3g2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make internal subtitle and subtitle switching work with -audiofilereimar2008-05-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26849 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use av_alloc_put_byte instead of custom protocol.reimar2008-05-211-48/+11
| | | | | | | This needs less code and less hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26848 b3059339-0415-0410-9bf9-f77b7e298cf2
* Continue detection if it is not clear if we have a MP3 or flac file.reimar2008-05-211-1/+2
| | | | | | | Fixes http://samples.mplayerhq.hu/A-codecs/MP3/01%20-%20Charity%20Case.mp3 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26844 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffmpeg ea maxis xa adpcm audio decodercompn2008-05-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26792 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove pointless parentheses from return statements.diego2008-05-166-20/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function, fixes the warning:diego2008-05-151-19/+0
| | | | | | | libmpdemux/demux_mkv.c:2242: warning: 'demux_mkv_reverse_id' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26784 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable, fixes the warning:diego2008-05-151-1/+0
| | | | | | | libmpdemux/demux_mkv.c:1401: warning: unused variable 'mkv_d' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26782 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Break overly long lines.diego2008-05-151-5/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26781 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark static tables const.diego2008-05-151-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26780 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark files that were imported from the MJPEG Tools suite as such.diego2008-05-144-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26777 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Revert license header cleanup on imported files.diego2008-05-142-33/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use standard license headers with standard formatting.diego2008-05-148-112/+124
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2
* add rl2 codeccompn2008-05-141-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26767 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffptx , works on ptx samplescompn2008-05-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: wording/spelling fixesdiego2008-05-111-18/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26734 b3059339-0415-0410-9bf9-f77b7e298cf2
* AVOption support for lavf demuxingmichael2008-05-101-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26728 b3059339-0415-0410-9bf9-f77b7e298cf2
* AVOptions support for lavf muxing.michael2008-05-101-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace a really ugly hack by a clean but not thread safe solution.michael2008-05-101-2/+7
| | | | | | | | (no threads so no problem anyway ...) This fixes the segfault with lavf muxing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26722 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mike Baker agreed to relicense his parts of the code as GPL v2+ on IRC.diego2008-05-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26680 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check ASF packet size before calling demux_asf_read_packet. Fixes segfaulteugeni2008-05-021-1/+5
| | | | | | | with damaged ASF files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26644 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary version.h #includes.diego2008-04-304-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge libmpdemux/Makefile into top-level Makefile.diego2008-04-241-73/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include base64.h with full path.diego2008-04-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2
* EXTRAXX_INC flags should now be added to .depend compilation,diego2008-04-231-1/+1
| | | | | | | not to the phony depend target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26508 b3059339-0415-0410-9bf9-f77b7e298cf2
* Take audio delay into account when seeking in avisynth demuxer.reimar2008-04-231-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26505 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate fps as double-precision to make switching to double-precision fps ↵reimar2008-04-231-1/+1
| | | | | | values easier. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26504 b3059339-0415-0410-9bf9-f77b7e298cf2
* .depend has to get all the CFLAGS that the files it contains dependencydiego2008-04-221-1/+1
| | | | | | | information for need. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26500 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add BFI video support through FFmpeg.diego2008-04-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26491 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r26412: policy violationrtogni2008-04-191-8/+7
| | | | | | | Mixes cosmetics and functional changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26470 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r26411: policy violationrtogni2008-04-191-963/+812
| | | | | | | | | Reindent of the file is not allowed Controversial cosmetics changes with no previous discussion Mix cosmetics and non-cosmetic changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26469 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prefer libavformat musepack demuxer over internal one (which does not even ↵reimar2008-04-161-0/+2
| | | | | | support v8). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_asf: Fix operator precedence in packet length checkuau2008-04-131-1/+1
| | | | | | | | Change (len & 3-1) to correct ((len & 3) - 1) in packet length check. Also change "a - 1 < b" to simpler "a <= b". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_real.c: Always use MP_NOPTS_VALUE for unknown ptsuau2008-04-121-1/+1
| | | | | | | | | | demux_real.c still had code that used either 0 or MP_NOPTS_VALUE for unknown timestamps depending on correct_pts setting. It should have been removed in svn commit 25988 "Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26413 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv.c: Mark some static tables constuau2008-04-121-7/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26412 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reformat demuxer.cuau2008-04-121-812/+963
| | | | | | | | Indent with "indent -kr -l79 -nut" and fix various suboptimal results by hand. Also remove some commented-out cruft and one unnecessary case of parentheses as in "return (r)". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26411 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove global demuxer_typeuau2008-04-123-3/+1
| | | | | | | It was only used inside one function. Change it to a local variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26410 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove another two useless special-case from flac metadata reading functionreimar2008-04-121-20/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26408 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use AV_RB24reimar2008-04-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26407 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless checksreimar2008-04-121-8/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26406 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify (currently disabled) get_flac_metadatareimar2008-04-121-11/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function demux_read_data_packuau2008-04-112-18/+0
| | | | | | | | According to VCS history this function has never been used since it was added in 2001... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26401 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo in filenamediego2008-04-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update comment to account for renamed header file.diego2008-04-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26393 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split the lavf taglists out of the lavf muxer to allow using libmpmuxalbeu2008-04-095-62/+115
| | | | | | | without libmpdemux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split the aac header parsing out of aac demuxer to allow using libmpmuxalbeu2008-04-093-20/+51
| | | | | | | without libmpdemux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make stream independent of libmpdemux, the asf demuxer and streamingalbeu2008-04-092-72/+104
| | | | | | | code share a function and a few definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix lots and lots of other demuxers broken by r26301reimar2008-04-059-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove another useless castreimar2008-04-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless castreimar2008-04-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26329 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoderreimar2008-04-051-0/+6
| | | | | | | and also will create proper files when remuxing into e.g. AVI. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26328 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set demuxer->audio->id to avoid breakage due to r26301reimar2008-04-051-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set correct codec tag for raw rgb in mov, fixesreimar2008-04-051-0/+6
| | | | | | | http://samples.mplayerhq.hu/mov/rawbgr24.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary includesuau2008-04-011-4/+0
| | | | | | | | | | command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h mplayer.c: Don't include libmpdemux/matroska.h matroska.h: Remove declaration of already removed function demux_mkv_change_subs and stop including demuxer.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26313 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support 'default' attribute for audio and subtitle tracks.eugeni2008-03-305-0/+42
| | | | | | | | | The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
* another DCA audio identified (0x86) used in BD; patch by kirill belokurov ↵nicodvb2008-03-171-0/+1
| | | | | | gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26261 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use HAVE_QUICKTIME instead of MACOSX preprocessor condition.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26249 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-059-0/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26175 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.diego2008-03-031-0/+2
| | | | | | | Thus there is no need to use it everywhere. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunatelydiego2008-03-021-10/+10
| | | | | | | | these identifiers appear in Windows system headers and are thus outside our direct control. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix illegal identifiers starting with _ and capital letters.diego2008-03-011-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support switching to/from nosound in demux_lavf.eugeni2008-02-291-14/+8
| | | | | | | | Also fixes a bug when pstreams[-1] could be accessed. It happens when switching audio tracks if mplayer was run with '-nosound'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26126 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function.eugeni2008-02-291-20/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26125 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent.eugeni2008-02-291-18/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26124 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't select audio stream in lavf and mkv demuxers.eugeni2008-02-292-13/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26123 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set audio->sh correctly when switching audio tracks. The same for video tracks.eugeni2008-02-291-0/+8
| | | | | | | | | Demuxers almost never update audio->sh or sub->sh when swithing tracks. It is especially bad when switching to no sound, and results in "too many audio packets" error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26121 b3059339-0415-0410-9b