summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'matroska'Uoti Urpala2010-01-281-33/+24
|\
| * demux: take chapter/attachment name strings without 0-terminationUoti Urpala2010-01-271-33/+24
| | | | | | | | | | | | | | | | | | 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 r30437Uoti Urpala2010-01-281-6/+29
|\ \ | |/ |/|
| * Add support for parsing MLP and TrueHD.reimar2010-01-241-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30427 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused variables.reimar2010-01-241-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reset the parser on seek. Should fix some cases of audio "blips" after seeking.reimar2010-01-241-6/+23
| | | | | | | | | | | | | | AC3 is still broken due to the libavcodec parser being broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30421 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move the resync-related code into more consistent places instead of having itreimar2010-01-241-35/+22
| | | | | | | | | | | | | | scattered all over the place with half of it forgotten in some places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-1/+135
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-271-1/+135
| | | | | | | | | | | | | | | | | | | | | | via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-1/+1
| |
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-21/+8
|\|
| * Free demuxer->teletext when closing the demuxer.reimar2009-11-101-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29874 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demuxer.c: Add initialization missing from previous commituau2009-11-021-21/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Reimar's previous commit ("Unbreak the demuxer-specific code in video.c with e.g.") added the new field "non_interleaved" in demux_stream structs, but this field was not initialized anywhere. Under suitable circumstances this could cause a "Too many video/audio packets in the buffer" error and failing playback. Fix the problem by cleaning up the code that creates new instances of the struct. Now fields will be initialized to 0 by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29812 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29684Uoti Urpala2009-09-161-0/+4
|\|
| * Reduce verbosity if demuxer sets an info value to the same as the current value.reimar2009-09-141-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29676 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-11/+4
|\|
| * Reuse ds_get_packet in ds_get_packet_ptsreimar2009-08-231-11/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29546 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-2/+3
|\|
| * Handle demuxers that never set filepos by using stream_tell.reimar2009-08-171-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29528 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove internal libass treeUoti Urpala2009-07-261-4/+1
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-0/+7
|\|
| * Print information about chapters with -identify.reimar2009-06-281-0/+7
| | | | | | | | | | | | | | Patch by Adrian Stutz [adrian sttz ch] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29408 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-1/+19
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-1/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-25/+29
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-25/+25
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge branch 'ordered_chapters'Uoti Urpala2009-04-081-59/+18
|\ \
| * | Change demuxer_seek_chapter() parametersUoti Urpala2009-04-021-56/+15
| | | | | | | | | | | | | | | | | | Remove the "num_chapters" and "mode" parameters that aren't needed by any callers. Change "float *seek_pts" to "double *". Allocate the string returned via "chapter_name" with talloc.
| * | Allocate struct demuxer with tallocUoti Urpala2009-03-211-3/+3
| | | | | | | | | | | | Makes it possible to add data to it without explicit freeing code.
* | | Merge svn changes up to r29117Uoti Urpala2009-04-011-0/+4
|\ \ \ | |/ / |/| / | |/
| * Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream isreimar2009-03-291-0/+4
| | | | | | | | | | | | | | | | created that matches the user-requested one. Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29095 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-2/+0
|\|
| * Remove native nuv demuxer, it only needs more code to achieve the same thingreimar2009-03-091-2/+0
| | | | | | | | | | | | | | as the libavformat demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28065Uoti Urpala2008-12-021-0/+4
|\|
| * MNG demuxer by Stefan Schuermans, stefan blinkenarea orgdiego2008-11-301-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux: Reset demux stream 'eof' flag after packet buffer overflowUoti Urpala2008-10-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | The eof flag is set when another demuxer stream has hit the limit on the size or count of buffered packets. This makes sense because in that error situation the calling code can not rely on being able to demux more packets from this stream, so it should rather exit or whatever instead of getting stuck trying. However the situation can improve if packets are demuxed from the other stream. In that case the eof flag should be cleared. This commit adds code to clear the flag if something is successfully read from the stream (so it's only cleared if a caller tries to read packets despite the flag being set; that's enough to fix audio sync issues after video packet buffer overflow).
* | Make various functions staticUoti Urpala2008-08-121-1/+1
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-2/+2
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: MUSEPACK --> CONFIG_MUSEPACKdiego2008-08-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename preprocessor directives related to image libraries.diego2008-08-051-1/+1
| | | | | | | | | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-3/+3
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-3/+3
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-9/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-9/+9
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-211-0/+7
|\|
| * Avoid including avcodec.h in demuxer.h (and thus many other files) just to getreimar2008-07-171-0/+7
| | | | | | | | | | | | | | | | | | FF_INPUT_BUFFER_PADDING_SIZE. Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it is big enough. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27092Uoti Urpala2008-06-171-43/+33
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * cosmetics: Remove useless parentheses, align.diego2008-06-161-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support NULL name parameter for demuxer_add_chapter.reimar2008-06-161-1/+1
| | | | | | | | | | | | | | Patch by Anton Khirnov [wyskas gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Break overly long lines.diego2008-06-161-97/+178
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27088 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentation, whitespace changesdiego2008-06-161-648/+645
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: consistent * placementdiego2008-06-161-21/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: one more if brace placement fixdiego2008-06-161-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * M-x untabifydiego2008-06-161-24/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove all trailing whitespace.diego2008-06-161-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Split/join multiline statements.diego2008-06-161-4/+6
| | | |