summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Respect -noidx in lavf demuxerreimar2006-12-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set AVFMT_FLAG_GENPTS if -correct-pts is used.uau2006-12-101-0/+4
| | | | | | | | | | | | | This should allow using -correct-pts (and thus filters which adjust pts or add frames) with dvd or other mpeg container files by specifying "-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2 decoder too but certainly not with internal demuxer. Using this flag isn't quite optimal as it can cause extra buffering of demuxed frames, but at least it's better than just failing until a more complex solution is implemented. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
* align vbuf_size to the max value allowed by main profile @ high levelnicodvb2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace another MIN macro by FFMINreimar2006-12-091-10/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-096-29/+17
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove condition that should always be truereimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash in ogg demuxer uninit with -aidreimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
* made vorbis_info a member of ogg_stream rather than ogg_demuxer;nicodvb2006-12-071-11/+17
| | | | | | | this change paves the way for multi audio track support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
* vorbis_comment is only used locally, move it out of demuxer structreimar2006-12-071-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused ov_struct_treimar2006-12-071-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around libavutil/bswap.h compilation problems due to always_inline ↵reimar2006-12-075-5/+5
| | | | | | undefined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.reimar2006-12-061-0/+4
| | | | | | | | Code still seems wrong to me for multiple audio tracks, since there is only one vorbis comment/info entry for the demuxer, not one per track? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable telecining when it can't be appliednicodvb2006-12-041-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
* since display_frames in increased by a possibly negative number it had ↵nicodvb2006-12-041-1/+1
| | | | | | better be signed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmeticsnicodvb2006-12-041-16/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed dead codenicodvb2006-12-041-17/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
* reimplemented :telecine and :film2pal in terms of dgpulldownnicodvb2006-12-041-76/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
* pre-store in bff_mask the correct or-mask to be saved in the pce (slightly ↵nicodvb2006-12-041-5/+4
| | | | | | faster) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: wrong bitmask when patching the pce_ptr in soft_telecine()nicodvb2006-12-041-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
* added generalized teleciner by Donald Graftnicodvb2006-12-041-4/+61
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename: ass_process_font -> ass_add_font.eugeni2006-12-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use libavutil LE_* macros instead of pointer casts which can resultreimar2006-12-031-6/+6
| | | | | | | in crashes due to missing alignment. Should fix bug #640. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21470 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: anti-chaos reindentationnicodvb2006-12-031-15/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unicode support for demuxer info in ASF demuxer.reimar2006-12-031-50/+56
| | | | | | | Patch by Zuxy Meng [zuxy meng <at> gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous bswap.h include.diego2006-12-0213-17/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove suffix rules that are just copies of make builtin rules.diego2006-12-021-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use standard name for C++ flags.diego2006-12-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit to specify the sizes of the decoders' buffersnicodvb2006-12-011-10/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l confused FFMIN/FFMAXreimar2006-12-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
* Proper fix for last demux_avi commit, stream switching now really shouldreimar2006-12-011-8/+9
| | | | | | | not hang anymore git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure we do not hang if no streams are availablereimar2006-12-011-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement stream switching for AVI demuxer.reimar2006-12-011-0/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add libav include paths to CFLAGS without indirection.diego2006-12-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use av_int2flt/av_int2dbl to read float values. This is simpler and morereimar2006-11-301-10/+3
| | | | | | | correct since it also works for int endianness != float endianness. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21404 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move initialization of sh_audio/sh_video members to aviheaderreimar2006-11-302-12/+6
| | | | | | | | where possible so that all a_streams[]/v_streams[] are initialized and switching becomes simpler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21403 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some superfluous include CFLAGS.diego2006-11-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-298-9/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for Westwood SND1 audiodiego2006-11-291-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21378 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix 2 header bugs introduced by nplourde's previous commit:uau2006-11-281-1/+3
| | | | | | | | | #include "loader/qtx/qtxsdk/components.h" needs inttypes.h which was no more implicitly included by earlier headers, and "#ifdef MACOSX" was used before '#include "config.h"'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21370 b3059339-0415-0410-9bf9-f77b7e298cf2
* reordering of #include to avoid clash with math.h and quicktime/*.h, patch ↵nplourde2006-11-281-8/+8
| | | | | | by Crhis Roccati<roccati@pobox.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use av_int2dbl to read doubles instead of our somewhat broken le2me_dblreimar2006-11-281-2/+4
| | | | | | | (le2me_dbl assumes float and int endianness are the same). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21363 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove long double reading code, long double was never used AFAICT and reimar2006-11-281-9/+0
| | | | | | | is gone from the specification since a long time due to portability issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21360 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Sort SRCS by alphabetical order.diego2006-11-281-20/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21353 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split muxers into a separate library that only MEncoder is linked against.diego2006-11-271-9/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common code to mpcommon.mak.diego2006-11-271-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary header indirection.diego2006-11-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21305 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Muxers were not being compiled even when MEncoder was enabled.diego2006-11-271-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg-style conditional dependency declarationdiego2006-11-261-43/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge common parts of all Makefiles into one file included by all.diego2006-11-261-28/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify, remove useless indirection.diego2006-11-261-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cleanup for uselessly complicated closed-caption subtitle handlingreimar2006-11-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous comment.diego2006-11-251-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: indentation fix.eugeni2006-11-231-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit muxing to raw pes (VDR uses this)nicodvb2006-11-211-5/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous empty variable declaration.diego2006-11-211-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
* check we aren't short of sh_videos before allocating another onenicodvb2006-11-201-13/+35
| | | | | | | | and fail if the allocation doesn't succeed; added support for video stream switching git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
* slight simplification in demux_control_ts: no need to check *arg with ↵nicodvb2006-11-201-1/+1
| | | | | | last_{aid,vid} (small bugfix, too) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify dep/depend targets.diego2006-11-201-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reorganize code to move more things out of main().uau2006-11-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)nicodvb2006-11-191-79/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
* during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'nicodvb2006-11-191-6/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, compilation error in r21054reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-193-33/+2
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -slang work again, sub->id is -2 by default, so -slang would be ignoredreimar2006-11-191-1/+1
| | | | | | | with old code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create a sh_sub_t for ogg subtitles.reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support multiple subs in movreimar2006-11-191-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix demux_nut to give proper (estimate) of percent position after a seekods152006-11-181-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add disabled EAGAIN testing code for libnutods152006-11-181-6/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
* move demux_nut priv calloc to init() instead of check_file()ods152006-11-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_IDENTIFY_PROGRAMnicodvb2006-11-181-0/+85
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
* new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)nicodvb2006-11-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for XAN DPCM audiodiego2006-11-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for some more fringe formats, still buggy ..diego2006-11-171-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try reading palette for vobsubreimar2006-11-171-1/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20995 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pseudo-support for subtitles in ↵reimar2006-11-171-0/+1
| | | | | | http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20992 b3059339-0415-0410-9bf9-f77b7e298cf2
* missed piece in update to libnut API - non negative errorsods152006-11-171-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
* support flic video through lavfdiego2006-11-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
* COSMETICS: reformattednicodvb2006-11-161-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
* restored circular looping when changing audio and video stream (previously ↵nicodvb2006-11-161-2/+6
| | | | | | broken) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
* reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIOnicodvb2006-11-161-0/+2
|