Commit Graph

3409 Commits

Author SHA1 Message Date
diego 5007aa845f Cast void* pointer to appropriate type before using it in an addition; fixes
libmpdemux/demux_mkv.c:1873: warning: pointer of type 'void *' used in arithmetic


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31276 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 22:22:07 +00:00
diego c0262f7435 Drop pointless _t suffix from 'struct lavf_priv'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31247 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 00:25:28 +00:00
diego 5796e96b36 Drop pointless _s suffix from 'struct af_stream'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31238 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 20:59:40 +00:00
diego 52b364075b cosmetics: Reformat in K&R coding style.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31234 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:46:47 +00:00
diego 16a226da45 Remove two pointless void* casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31233 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:13:53 +00:00
diego 8350f5430a Remove unnecessary demux_mkv_seek() forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31232 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:05:30 +00:00
diego b17704e6a8 cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:10:27 +00:00
reimar 1e0b9a97fd Switch ogg demuxing to lavf by default.
This has the side-effect of using fftheora by default instead of
theora, which possibly should be changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31225 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 18:01:38 +00:00
hyc 3c1cedaa56 Add support for STREAM_CTRL_SEEK_TO_TIME in ffmpeg streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31218 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-25 23:07:28 +00:00
cehoyos 4e2622ed33 Do not use correct-pts for mpeg-ps: It breaks PAFF samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 01:17:59 +00:00
diego 12f67b8372 Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
diego 3921b71706 Use the system liba52 headers when internal liba52 is disabled, fixes:
libmpdemux/muxer_mpeg.c:2121: warning: implicit declaration of function 'a52_syncinfo'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31146 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 12:28:15 +00:00
aurel 88b6dd6fc2 cosmetic: typo, this wasn't supposed to be plural
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31137 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-04 18:46:42 +00:00
aurel eaff21c633 print a more detailed and more useful description of each stream with lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31132 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 22:45:00 +00:00
aurel c58a1d4acb 10l: correctly use video_stream instead of audio_stream in the video section
( copy&paste error :( )


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31131 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 22:40:00 +00:00
aurel 8be7c74c64 add ID_..._NAME to -identify for each lavf stream which has a title
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31130 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 22:30:06 +00:00
aurel 59058b54a7 uniformize handling of aid and vid with lavf so that it matches handling of sid
aid and vid are now 0-based, instead of being a globally unique id.
This matches the way sid is handled and the way other demuxers manage aid.
As a side effect, it slightly simplifies demux_lavf.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31129 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 22:19:52 +00:00
cehoyos 0fd8d985f0 Silence permanent warning messages when decoding H264 over rtsp with
live555.

Patch by Gil Pedersen, gil A cmi D aau D dk 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-02 10:47:40 +00:00
reimar 11b178be9a Continue probing even for score == AVPROBE_SCORE_MAX / 4 to match
FFmpeg's behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31111 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-01 15:38:37 +00:00
reimar dd8db7f620 Use av_probe_input_format2 and avoid accepting detection
while the score is still low.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31110 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-01 13:50:49 +00:00
diego 7120f1dfba Merge two redundant if checks, patch by ubitux, ubitux gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31042 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:42:28 +00:00
diego e903e9eb5e cosmetics: reindent demux_ogg.c to K&R style plus some prettyprinting
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31041 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:34:32 +00:00
diego 51d72c7764 Mark muxer-related m_option_t arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:12:23 +00:00
reimar c800858e60 Make audio switching with AVI demuxer chose the first audio stream
if audio is disabled instead of ignoring the request.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 18:45:00 +00:00
reimar 67dcbed681 Support concatenated YUV4MPEG files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30970 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 16:01:22 +00:00
reimar ce67a0caf7 Use calloc instead of malloc+memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30969 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 15:35:59 +00:00
reimar df61424414 100l, fix frametime calculation for MPEG-2 files with frame rate extension.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30966 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 12:47:26 +00:00
reimar 364fb6d26f Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30947 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-22 19:39:43 +00:00
reimar b28b15db30 Start probing with a size matching the stream buffer size so it is possible
to restart without seeking even without cache for easily detectable formats.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30946 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-22 19:38:42 +00:00
cehoyos 6c239f12ff Calculate width and height in mp4_header_process_vop().
Fixes elementary streams with -vc ffodivxvdpau and the native demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30904 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:32:11 +00:00
cehoyos 0eee2d2bd5 Fix value of bit counter at end of functions to prepare for future patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:28:08 +00:00
reimar e03ff1e0ef Return MP_NOPTS_VALUE if we can't figure out the pts, not 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30879 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:21:39 +00:00
reimar da87897b1b Improve handling of 0-size ogg packets.
Fixes bug 1664.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30878 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:19:32 +00:00
cehoyos 97ef28ad9a Fix alpabetical order.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30876 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 17:15:07 +00:00
cehoyos 12d78a9e5c Support SEGA CRI adx codec with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30875 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 14:33:11 +00:00
iive 1ede72d581 Increase mplayer buffer padding size to match the new one from ffmpeg.
Allows compilation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30860 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-07 23:18:37 +00:00
cehoyos c44915814c Remove unused static function mp_mp3_get_lsf().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30774 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 21:29:06 +00:00
diego 01c5a73c53 Remove pointless #ifdef checks for DEMUXER_H, which is never set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30759 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 12:48:11 +00:00
diego 664e5bb9b8 Remove unnecessary stream.h #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30758 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 12:45:12 +00:00
cehoyos 3a43f13fce Fix compilation of C++ source files (partly reverts r30744).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30755 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 11:32:48 +00:00
diego 89777b1f57 cosmetics: Rename "codecs_st" struct to just plain "codecs".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30752 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 20:01:04 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
reimar 136c046e06 Add cast to proper type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30738 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:44:02 +00:00
tack cc8a878a9c Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in a
wave file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:27:32 +00:00
diego 22e310b9ae Declare public function print_vprp() in aviprint.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30694 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 23:36:36 +00:00
diego 5c85286eb5 Drop weird and unnecessary _s/_st suffixes from demuxer struct names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30686 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 20:03:49 +00:00
diego 6ed62435a7 Add names to anonymous structs sh_common, sh_audio, sh_video, sh_sub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30685 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 20:02:50 +00:00
diego e0bc115b4d cosmetics: Rename struct vf_instance_s --> vf_instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 15:48:03 +00:00
reimar 160b880c4f Fix fps output with -identify when frame rate extension is used for MPEG-2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30683 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 14:43:36 +00:00
reimar b3406c7d67 Initialize frame rate extension fields in mp_header_process_sequence_header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30682 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 14:05:51 +00:00