summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* demux_mkv.c: Compiler warning fixesUoti Urpala2008-04-281-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | * libmpdemux/demux_mkv.c:218: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type * libmpdemux/demux_mkv.c:1235: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type Change grow_array to return the reallocated pointer instead of setting it through a void **. * libmpdemux/demux_mkv.c:1396: warning: unused variable ‘mkv_d’ Remove. * libmpdemux/demux_mkv.c:1740: warning: pointer of type ‘void *’ used in arithmetic Change struct mkv_track->private_data from void * to unsigned char *. * libmpdemux/demux_mkv.c:2693: warning: assignment from incompatible pointer type Add a cast. * libmpdemux/demux_mkv.c:2239: warning: ‘demux_mkv_reverse_id’ defined but not used Remove the function (together with preceding useless advance declaration of demux_mkv_seek).
* Merge svn changes up to r26540Uoti Urpala2008-04-262-74/+1
|\ | | | | | | | | | | Conflicts: Makefile
| * 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
* | Make video decoder description structs constUoti Urpala2008-04-251-1/+1
| | | | | | | | | | | | This makes the per-decoder struct vd_functions and its ->info struct constants. Same for the mpcodecs_vd_drivers[] table of pointers to those structs.
* | Remove global vo_flagsUoti Urpala2008-04-251-0/+1
| | | | | | | | Move the information to struct sh_video field.
* | Store video decoder functions in struct sh_video fieldUoti Urpala2008-04-251-0/+1
| | | | | | | | | | | | Remove the global variable mpvdec and move the video decoder pointer to struct sh_video field vd_driver. Audio already had a similar ad_driver field from before.
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-254-24/+24
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Merge svn changes up to r26510Uoti Urpala2008-04-233-3/+6
|\| | | | | | | | | r26469 and r26470 (which revert files to inferior versions "because it's policy") are ignored.
| * 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
* | Remove some unnecessary recursive includesUoti Urpala2008-04-232-10/+4
| | | | | | | | | | | | | | | | Remove some #include lines from headers, some of those removals made possible by using incomplete struct types instead of typedefs. Include mp_osd.h in mplayer.c and command.c after removing it from mp_core.h. Remove "#ifdef USE_ASS" around some "struct ass_track_s *" fields which will now compile even without ASS support.
* | Move dvdsub_id to options structUoti Urpala2008-04-234-12/+2
| | | | | | | | | | | | | | Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c.
* | Mark some functions staticUoti Urpala2008-04-233-3/+5
| | | | | | | | | | | | These functions aren't used outside their file and have no prototype in any header. Based on a forgotten patch from 2006 by Stefan Huehner, (stefan huehner org).
* | Move correct_pts to options structUoti Urpala2008-04-234-11/+9
| |
* | Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-237-31/+55
| |
* | Declare demuxer *_streams fields with proper typesUoti Urpala2008-04-232-6/+6
|/ | | | | | | | Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef names only a matching struct name (without _t) too. Change the a_streams, v_streams and s_streams demuxer fields from void * to struct sh_audio *, struct sh_video * and struct sh_sub *. Remove a now unnecessary cast from mplayer.c.
* 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-9bf9-f77b7e298cf2
* Don't select subtitle track in lavf and mkv demuxers.eugeni2008-02-293-32/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer-independent functions for selecting tracks based on language.eugeni2008-02-292-0/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove stupid checks of free() argument.eugeni2008-02-292-28/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitleeugeni2008-02-295-45/+8
| | | | | | | track language. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio trackeugeni2008-02-293-23/+4
| | | | | | | language when available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26115 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add language info to sh_sub_t and sh_audio_t.eugeni2008-02-292-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26114 b3059339-0415-0410-9bf9-f77b7e298cf2
* in ds_fill_buffer() disabled the code that demuxes until the arrival of the ↵nicodvb2008-02-251-0/+2
| | | | | | right reference_clock git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26103 b3059339-0415-0410-9bf9-f77b7e298cf2
* sun rasterfile decodercompn2008-02-251-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26102 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-258-36/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* reset_fifos() resets demuxer->reference_clock to MP_NOPTS_VALUEnicodvb2008-02-231-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26071 b3059339-0415-0410-9bf9-f77b7e298cf2
* read the PCR of the currently playing program (if available) in ↵nicodvb2008-02-231-3/+45
| | | | | | demuxer->reference_clock git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26070 b3059339-0415-0410-9bf9-f77b7e298cf2
* New member in demuxer_t: reference_clock.nicodvb2008-02-232-0/+10
| | | | | | | | |