aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
Commit message (Collapse)AuthorAge
* Merge svn changes up to r27573Gravatar Uoti Urpala2008-09-10
|\ | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * Make internal Matroska demuxer default againGravatar uau2008-09-09
| | | | | | | | | | | | | | | | | | | | Undo Aurelien's previous commit which made the lavf demuxer the default. SSA/ASS subtitles do not work properly with the lavf demuxer at the moment. That's much more important than any issues with the internal demuxer. The internal demuxer must remain the default at least until the subtitle issues are resolved. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27556 b3059339-0415-0410-9bf9-f77b7e298cf2
| * revert r27551 which break much more things than it fixesGravatar aurel2008-09-09
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27555 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use internal demuxer for Matroska files for nowGravatar uau2008-09-08
| | | | | | | | | | | | | | | | | | Change the default demuxer back to the internal one at least until the current lavf breakage with SSA/ASS subtitles is sorted out. There have also been quite a few other regressions so maybe the lavf demuxer should be tested a bit more before trying to make it the default again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27551 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert bad changes to SSA/ASS subtitle packet formatGravatar uau2008-09-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27550 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after libavcodec major version 52 changesGravatar uau2008-09-08
| | | | | | | | | | | | | | | | | | | | | | Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_mkv: output correctly formated ASS packetsGravatar aurel2008-09-05
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27529 b3059339-0415-0410-9bf9-f77b7e298cf2
| * lavf: the subtitles display duration is stored in pkt.convergence_durationGravatar aurel2008-09-04
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27525 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Gravatar Uoti Urpala2008-09-03
|\|
| * support E-AC-3 decoding using ffmpegGravatar aurel2008-09-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27514 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused GUID_t definition that also incorrectly defined GUID_DEFINEDGravatar reimar2008-08-31
| | | | | | | | | | | | (while actually not defining GUID, only GUID_t). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * handle the lavfpref demuxer in the same way as the lavf oneGravatar aurel2008-08-27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * prefer libavformat to demux matroska filesGravatar aurel2008-08-26
| | | | | | | | | | | | | | I can't spot any regression anymore. If you find one, please tell me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27484 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationGravatar aurel2008-08-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27480 b3059339-0415-0410-9bf9-f77b7e298cf2
| * use new lavf API to grab sample_aspect_ratio from the demuxersGravatar aurel2008-08-24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27479 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add mapping for real audio and video CODEC_ID to MPlayer's fourccGravatar aurel2008-08-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27461 b3059339-0415-0410-9bf9-f77b7e298cf2
| * demux_lavf: fix mp_seek behavior in case of seeking errorGravatar aurel2008-08-13
| | | | | | | | | | | | | | | | | | | | | | | | When trying to seek past the end of file, the ByteIOContext expect that the stream is left in the same state as it was before the tentative seek. stream_seek() does not meet this expectation. It changes current position when seeking past the end of file. Thus, it is necessary to reset the stream to its previous state after a seek failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27459 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Gravatar Uoti Urpala2008-08-12
|\|
* | Make various functions staticGravatar Uoti Urpala2008-08-12
| |
* | Include corresponding .h in some .c filesGravatar Uoti Urpala2008-08-12
| |
| * fix audio in some rtsp streams, ok'd by lu_zeroGravatar compn2008-08-11
| | | | | | | | | | | | | | | | patch by Changjin Liu - !lcj.liu!at!gmail!com! http://thread.gmane.org/gmane.comp.video.mplayer.user/56893/focus=56894 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27449 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Gravatar Uoti Urpala2008-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 andGravatar diego2008-08-07
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: MUSEPACK --> CONFIG_MUSEPACKGravatar diego2008-08-07
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename font-related preprocessor directives.Gravatar diego2008-08-07
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename a bunch of miscellaneous preprocessor directives.Gravatar diego2008-08-07
| | | | | | | | | | | | | | 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 all preprocessor directives related to Apple / Mac OS X.Gravatar diego2008-08-06
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename preprocessor directives related to image libraries.Gravatar diego2008-08-05
| | | | | | | | | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromGravatar diego2008-08-03
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Gravatar Uoti Urpala2008-08-02
|\| | | | | | | | | | | | | | | | | | | 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_Gravatar diego2008-08-02
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;Gravatar diego2008-08-01
| | | | | | | | | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Gravatar Uoti Urpala2008-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2008-07-30
| | | | | | | | | | | | | | | | 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
| * changed 'Audio file' to 'Audio only' (to not get 'Audio file file' when played)Gravatar ptt2008-07-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27365 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add ffvp6a codecGravatar compn2008-07-28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27356 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add ffmotionpixels codecGravatar compn2008-07-28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27355 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of horrible code that relies on codec-set context variable,Gravatar reimar2008-07-26
| | | | | | | | | | | | | | | | it is useless anyway since all the necessary information is available anyway. This also makes MPlayer display the correct length for Theora-in-Ogg-Videos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27354 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Gravatar Uoti Urpala2008-07-21
|\|
| * Avoid including avcodec.h in demuxer.h (and thus many other files) just to getGravatar reimar2008-07-17
| | | | | | | | | | | | | | | | | | 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
| * limits.h is required for UINT_MAXGravatar reimar2008-07-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27305 b3059339-0415-0410-9bf9-f77b7e298cf2
| * And a 1000l for r27263, swapped a condition, thus setting size toGravatar reimar2008-07-16
| | | | | | | | | | | | | | 0 when malloc succeeded instead of when it failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, fix calloc being called with the wrong argument due to reorderingGravatar reimar2008-07-16
| | | | | | | | | | | | | | two lines in SVN r27263 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure demuxed ASF packet is properly padded after descramblingGravatar reimar2008-07-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27302 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.hGravatar reimar2008-07-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not just print a warning, also fix the len in ASF demuxer!Gravatar reimar2008-07-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27299 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27281Gravatar Uoti Urpala2008-07-15
|\|
| * Change a broken check. FFMAX does not work as intended because ↵Gravatar reimar2008-07-14
| | | | | | | | | | | | | | | | | | trak->chunkmap[i].first is unsigned and j is signed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, do not use macros on functions that are not idempotentGravatar reimar2008-07-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27275 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent after last commitGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-19 01:35:17 +0000