summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30732Uoti Urpala2010-03-103-0/+19
|\
| * Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in atack2010-02-223-0/+19
| | | | | | | | | | | | | | wave file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30694Uoti Urpala2010-03-101-0/+1
|\|
| * Declare public function print_vprp() in aviprint.h.diego2010-02-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30694 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop weird and unnecessary _s/_st suffixes from demuxer struct names.diego2010-02-214-20/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add names to anonymous structs sh_common, sh_audio, sh_video, sh_sub.diego2010-02-211-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30685 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30683Uoti Urpala2010-03-104-5/+16
|\|
| * Fix fps output with -identify when frame rate extension is used for MPEG-2reimar2010-02-211-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30683 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize frame rate extension fields in mp_header_process_sequence_headerreimar2010-02-211-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30682 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Parse and use the information from the frame rate extension header for MPEG-2.reimar2010-02-213-4/+11
| | | | | | | | | | | | | | | | -identify still does not show the right values though. Fixes bug #1636. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg supports Bink, let MPlayer play it as wellkostya2010-02-211-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30679 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-2016-20/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30672Uoti Urpala2010-03-101-3/+3
|\|
| * Do not discard stream buffer on eof, instead reuse it to slightly improvereimar2010-02-201-1/+1
| | | | | | | | | | | | | | format autodetection with -nocache and non-seekable streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30668 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print demuxer name in "freeing demuxer" message.reimar2010-02-201-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30666 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-101-1/+1
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Print all 64 bits of seek position.reimar2010-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30662 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-1035-121/+303
|\|
| * Add header for AVI print functions; avoids many forward declarations.diego2010-02-189-29/+42
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for asf_check_header, read_asf_header; avoids forward declarations.diego2010-02-173-6/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30629 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include proper header for skip_audio_frame() instead of forward declaring it.diego2010-02-171-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30628 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.diego2010-02-173-4/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove demux_ogg-related declarations that are no longer necessary.diego2010-02-171-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30626 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark demux_ogg_sub_id() as static; it is not used outside of the file.diego2010-02-171-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30625 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move up demux_ogg_sub_id, demux_ogg_sub_reverse_id; avoids forward declarations.diego2010-02-171-29/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30624 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add read_avi_header() to aviheader.h; avoids forward declarations.diego2010-02-172-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30623 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header file for store_ughvlc(); avoids forward declarations.diego2010-02-173-3/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30622 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add mp_getbits() to mpeg_hdr.h to avoid a forward declaration.diego2010-02-172-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30621 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpdemux: Remove pointless leftover '#if 1' preprocessor instructions.diego2010-02-173-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations.diego2010-02-174-3/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30619 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add separate header for mp_a52_framesize(); avoids forward declarations.diego2010-02-173-3/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30618 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add config.h header #include; it is required for the HAVE_BIGENDIAN check.diego2010-02-171-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30617 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add separate header for aac_parse_frame(); avoids forward declarations.diego2010-02-174-9/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30616 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add separate header for real_fix_timestamp(); avoids forward declarations.diego2010-02-173-2/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30615 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark mp_mp3_get_lsf() as static; it is not used outside of the file.diego2010-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30614 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark mov_build_index() as static; it is not used outside of the file.diego2010-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30613 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpdemux: Mark functions not used outside of their files as static.diego2010-02-179-16/+32
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30605Uoti Urpala2010-03-091-0/+1
|\|
| * Support FFmpeg's ALS decoder.reimar2010-02-161-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30604 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include corresponding .h files in .c files.diego2010-02-161-0/+1
| | | | | | | | | | | | | | This ensures that function declarations in both files always match. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30596 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-093-12/+6
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Remove pointless header #includes; #include only required header stdint.h.diego2010-02-161-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30590 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make len unsigned. More correct anyway and avoids sign extension to 64 bitreimar2010-02-141-1/+1
| | | | | | | | | | | | | | for the 64+32 bit addition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30584 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify and slightly speed up avi_stream_id function.reimar2010-02-141-6/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30583 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify.reimar2010-02-141-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30580 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30550Uoti Urpala2010-03-091-6/+18
|\|
| * Dynamically increase probe size for lavf demuxer up to 2 MB.reimar2010-02-121-6/+18
| | | | | | | | | | | | | | | | | | | | This will read progressively more data if we still did not detect the format. The lavfpref demuxer is unaffected to avoid hanging for a long time in case of a slow network stream that some native demuxer may be able to handle. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30547 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30502Uoti Urpala2010-03-091-6/+12
|\| | | | | | | | | | | | | | | Conflicts: libswscale/rgb2rgb.c libswscale/rgb2rgb.h libswscale/swscale.c libvo/x11_common.c
| * Replace incorrect usage of strncpy.reimar2010-02-031-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindentreimar2010-02-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme.reimar2010-02-031-4/+9
| | | | | | | | | | | | | | ffmpeg://rtsp://... will play a rtsp stream via FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove ds_fill_buffer calls from demux_resync, they cause issues at least withreimar2010-01-261-2/+5
| | | | | | | | | | | | | | | | the ASF demuxer (seek seems to end up right after the keyframe?) and seem to have no purpose anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30438 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demuxer.h: increase input buffer padding to 64 to match FFmpegUoti Urpala2010-03-091-1/+1
| | | | | | | | | | | | FFmpeg increased the amount of padding that must be readable beyond input buffers without SIGSEGV from 8 to 64, and the MPlayer value must be changed accordingly.
* | translations: tweak cases that relied on concatenating adjacent stringsUoti Urpala2010-03-078-15/+31
| | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-071-1/+1
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | demux_mkv: remove incorrect error message about compressionUoti Urpala2010-01-281-1/+1
| | | | | | | | | | | | The demuxer still printed a message about "unknown/unsupported compression algorithm (3)" even though that is now supported and in fact played fine.
* | Merge branch 'matroska'Uoti Urpala2010-01-288-1272/+1886
|\ \
| * | demux_mkv: improve compression handlingUoti Urpala2010-01-271-26/+34
| | | | | | | | | | | | | | | | | | | | | Add support for compression algorithm 3 (header stripping). Rewrite some of the code related to handling manyfold compression, it was just completely broken (I don't have samples to test whether it actually works now).
| * | demux_mkv: use new EBML parser to read all track headersUoti Urpala2010-01-271-227/+135
| | |
| * | demux_mkv: handle compressed text subtitlesUoti Urpala2010-01-271-3/+6
| | | | | | | | | | | | | | | | | | | | | The decompression step wasn't run at all for subtitle types other than vobsub. Fix that. Remove a "!mkv_d->v_skip_to_keyframe" test from the subtitle handling - for properly timed subtitles unnecessary packets do little harm, and the subtitles could stay visible.
| * | demux_mkv: don't print errors for 0-size zlib decodingUoti Urpala2010-01-271-0/+4
| | | | | | | | | | | | | | | | | | Allow decoding a 0-sized buffer with zlib algorithm to produce 0-sized output. Fixes spurious errors reported with subtitle tracks marked to use compression for track private data without having any such data.
| * | demux_mkv: use new EBML parser to read TrackEncodingsUoti Urpala2010-01-271-151/+67
| | |
| * | demux_mkv: use new EBML parser to read Video elementUoti Urpala2010-01-271-61/+33
| | |
| * | demux_mkv: use new EBML parser to read Audio elementUoti Urpala2010-01-273-45/+25
| | |
| * | demux_mkv: use new EBML parser for Info parsingUoti Urpala2010-01-271-51/+29
| | |