1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

3052 Commits

Author SHA1 Message Date
Reimar Döffinger
7abe438045 Remove ff_mms_set_stream_selection again from asf demuxer,
it does not seem like a good solution to the problem and will
cause dependency problems if a libavprotocols should be split out.

Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 11:18:53 +00:00
Michael Niedermayer
dc29622385 Remove incorrect casts that should have never been there.
Originally committed as revision 11824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:55:58 +00:00
Reimar Döffinger
2907abed17 Remove a pointless cast.
Originally committed as revision 11819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:03:01 +00:00
Reimar Döffinger
4d65da424a Put is_mms under ifdef CONFIG_MMSH_PROTOCOL, avoids warning:
libavformat/asf.c:112: warning: 'is_mms' defined but not used

Originally committed as revision 11815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 21:17:46 +00:00
Reimar Döffinger
b630a39ecd Missing 'const' in cast.
Originally committed as revision 11814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 20:58:58 +00:00
Diego Biurrun
5f359c8d3e cosmetics: sort ogg_codec_t list
Originally committed as revision 11810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 14:55:57 +00:00
Baptiste Coudurier
73965d1b96 const
Originally committed as revision 11763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:43 +00:00
Baptiste Coudurier
47a0513b0c const
Originally committed as revision 11762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:32 +00:00
Baptiste Coudurier
2b12d6fc79 add const
Originally committed as revision 11756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 14:58:35 +00:00
Reimar Döffinger
2331e31c23 Add support for ogg text subtitles.
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 22:30:55 +00:00
Baptiste Coudurier
fa7343eaf2 stupid typo
Originally committed as revision 11693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 13:40:53 +00:00
Baptiste Coudurier
ccac843872 support rawvideo in mov
Originally committed as revision 11691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 11:31:56 +00:00
Baptiste Coudurier
d7742a7491 typo, typedef uint8_t GUID[16] in asf.h, and fix warning: asf-enc.c:202: warning: passing argument 2 of 'put_buffer' from incompatible pointer type
Originally committed as revision 11684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:34:22 +00:00
Baptiste Coudurier
febc8fad0c init to 0, fix warning: mpegenc.c:1022: warning: 'avail_space' may be used uninitialized in this function
Originally committed as revision 11683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:27:51 +00:00
Baptiste Coudurier
87be0d1289 add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||
Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:25:40 +00:00
Baptiste Coudurier
3dc761a443 typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
Originally committed as revision 11681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:22:25 +00:00
Baptiste Coudurier
4ad08accb2 use context in av_log
Originally committed as revision 11668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:31 +00:00
Baptiste Coudurier
c8134d7104 warning is only valid for mov
Originally committed as revision 11667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:04 +00:00
Reimar Döffinger
eb3ba13b51 Support MP4 subtitles as in
http://samples.mplayerhq.hu/MPEG-4/embedded_subs/1Video_2Audio_2SUBs_timed_text_streams_.mp4

Originally committed as revision 11663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 22:37:07 +00:00
Kostya Shishkov
eda178d273 SMPTE 421 Annex L format demuxer
Originally committed as revision 11661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 09:25:49 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:44:27 +00:00
Baptiste Coudurier
efc9e44da6 reorder object types id by muxing preference
Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:49 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:16 +00:00
Reimar Döffinger
cc8c2c6ab3 Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 19:57:04 +00:00
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 15:43:17 +00:00
Michael Niedermayer
cc8d87b793 Set subtitle codec id correctly, i hope this does not break anything.
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:57:53 +00:00
Michael Niedermayer
e73e3a926d Add non standard id needed for dvd subtitles.
Originally committed as revision 11626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:55:34 +00:00
Reimar Döffinger
7dfc1fdea2 Extract the pure plaintext from mov text subtitles.
Formatting information etc. is discarded.

Originally committed as revision 11625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 21:21:55 +00:00
Michael Niedermayer
1e3c9307e6 Set correct codec type and id for text subtitles.
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:30:03 +00:00
Michael Niedermayer
41e19673ef indent
Originally committed as revision 11623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:57 +00:00
Michael Niedermayer
ee6e2dbebf Only export packets which belong to the existing AVStream.
To export the others separate AVStreams must be created!

Originally committed as revision 11622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:30 +00:00
Michael Niedermayer
0bc4728e3b Select non jpeg if there are multiple substreams.
Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 19:50:04 +00:00
Baptiste Coudurier
067db6a58a comment vorbis objectype id
Originally committed as revision 11612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:24:35 +00:00
Baptiste Coudurier
4f8dc3b7f1 this one is not standardized either
Originally committed as revision 11611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:22:45 +00:00
Baptiste Coudurier
c63d3668fc remove non standard object type ids, if you find samples, report them
Originally committed as revision 11610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 01:35:51 +00:00
Aurelien Jacobs
7f938dd32b ensure av_rescale_q() can be calculated (won't divide by zero)
Originally committed as revision 11592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 23:43:25 +00:00
Luca Abeni
29e35d6776 Support out-of-band parameter sets in SDP for H.264 video
Originally committed as revision 11590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 14:28:58 +00:00
Luca Abeni
f79bfe481d Add support for H.264 video in the RTP muxer
Originally committed as revision 11589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 14:01:57 +00:00
Baptiste Coudurier
afecbec22b unset extension, so code path, and guess format do not choose
avm2/flash 9 by default, not sure this is adequate though,
this fixes regression tests.

Originally committed as revision 11588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 13:43:40 +00:00
Luca Abeni
b21cd0bcb5 Add minimal support for H.264 video in the SDP generator
Originally committed as revision 11585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 11:09:06 +00:00
Aurelien Jacobs
078ac1dbf2 add missing Makefile rules for pcm muxers/demuxers
Originally committed as revision 11579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 21:24:25 +00:00
Baptiste Coudurier
fa1ad97fad reorder alphabetically
Originally committed as revision 11575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 18:31:56 +00:00
Paul Egan
dfb400a8ea new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
Originally committed as revision 11574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 18:30:04 +00:00
Baptiste Coudurier
76e4864583 init uid to 0
Originally committed as revision 11573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 20:00:09 +00:00
Baptiste Coudurier
e20c865a55 indentation
Originally committed as revision 11572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:59:04 +00:00
Baptiste Coudurier
bb085dd6f1 correctly handle sony mpeg4 extradata
Originally committed as revision 11571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:58:48 +00:00
Baptiste Coudurier
6e3ea4461f check if read child returned error
Originally committed as revision 11570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:51:55 +00:00
Baptiste Coudurier
a33b2c7e39 simplify with matching len
Originally committed as revision 11568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 17:28:49 +00:00
Baptiste Coudurier
51169b61b5 simplify and detect better non frame wrapped mappings
Originally committed as revision 11567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 17:25:12 +00:00
Baptiste Coudurier
4de5906fed cosmetics: read_metadata -> read
Originally committed as revision 11566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:20:06 +00:00
Baptiste Coudurier
3f2d859b7e cosmetics
Originally committed as revision 11565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:19:06 +00:00
Baptiste Coudurier
3a9c08be1b remove unused crypto context uid
Originally committed as revision 11564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:18:32 +00:00
Baptiste Coudurier
7ee7f6f958 support dynamically allocated local tags, used by encrypted files
Originally committed as revision 11563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 16:17:39 +00:00
Baptiste Coudurier
57810910c7 check malloc return
Originally committed as revision 11562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 15:21:30 +00:00
Baptiste Coudurier
8513ba097c add some dv container uls
Originally committed as revision 11561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 13:16:35 +00:00
Baptiste Coudurier
c9c55a5699 simplify by checking min matching len
Originally committed as revision 11560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 13:16:00 +00:00
Ronald S. Bultje
f841a0fca1 Add a flags field to the RTPDynamicPayloadPacketHandlerProc (PKT_FLAG_*).
This can be used later by RDT to get the flags from the RTP packet and
use that for the RealMedia packet (such as whether this RTP packet
represents a keyframe or not). For discussion, see "[PATCH] Realmedia
/ RTSP (RDT)".

Originally committed as revision 11557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-18 20:48:32 +00:00
Roberto Togni
badbe09af3 Fix forgotten braces from r11039
Originally committed as revision 11552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-17 20:48:07 +00:00
Michael Niedermayer
175e23e875 Consider initial EOR in the back_ptr calculation.
Originally committed as revision 11550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-17 13:59:52 +00:00
Michael Niedermayer
76d7c327eb Replace idiotic (what moron wrote that code?) "buffer overflow" message by
abort()

Originally committed as revision 11546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-17 00:12:04 +00:00
Diego Biurrun
9b41eb37a1 Remove some spaces to keep certain people's eyes from hurting.
Originally committed as revision 11544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-16 22:47:51 +00:00
Diego Biurrun
a85736f21d misc spelling/grammar fixes
Originally committed as revision 11542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-16 22:14:26 +00:00
Luca Abeni
b973f9ad7e Make avc_find_startcode non-static, so that it can be used from other
files (and add the ff_ prefix, to avoid polluting the namespace)

Originally committed as revision 11532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-15 08:05:58 +00:00
Michel Bardiaux
6ba90c204c Suppress runaway index on streamed input
Originally committed as revision 11527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-14 16:11:08 +00:00
Roberto Togni
c5adfd641a Add support for S8 PCM (codec 2)
Fix samples/au/vrooom.au

Originally committed as revision 11522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-13 15:08:33 +00:00
Paul Kelly
3dea63bd7e user specifyable maximum amount of memory to use for the index.
patch by Paul Kelly  paul stjohnspoint co uk
with some changes by me

Originally committed as revision 11521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-13 13:33:37 +00:00
Víctor Paesa
1a04866480 Alignment
Originally committed as revision 11516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 11:25:54 +00:00
Víctor Paesa
a585c469a3 Link to libraries in dependency order.
Based on a patch by Gonzalo Garramuño, ggarra advancedsl com ar

Originally committed as revision 11515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 11:17:37 +00:00
Michael Niedermayer
f5b410312f Set pts/dts in raw (yuv,rgb,pcm) demuxers.
Originally committed as revision 11513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 00:24:10 +00:00
Michael Niedermayer
2024c2262b Write 0 instead of seeking forward (and leaving bytes uninitalized),
fixes odd regression test failure i had.

Originally committed as revision 11512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-12 00:15:05 +00:00
Aurelien Jacobs
9ab3f71b60 add a ff_ prefix to newly exported functions from avc.c
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 23:33:32 +00:00
Aurelien Jacobs
e609806ec6 Matroska muxer needs to format all NAL units, not only extradata.
Originally committed as revision 11510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 23:21:22 +00:00
Luca Abeni
cd4f256754 Do not install rtp.h (which should have never been part of the public API)
Originally committed as revision 11505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 12:24:46 +00:00
Aurelien Jacobs
e71b0534f2 matroskaenc now depends on avc.o
Originally committed as revision 11500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:37:38 +00:00
Aurelien Jacobs
aacc5f227a Use the isom avcc formatting for h264 extradata in matroska.
Originally committed as revision 11499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:32:45 +00:00
Aurelien Jacobs
1bd2d763d4 Move isom_write_avcc() and related functions into a separate file.
Originally committed as revision 11498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:24:55 +00:00
Aurelien Jacobs
6e6eebf919 extract isom_write_avcc into a function
Originally committed as revision 11497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:04:01 +00:00
Aurelien Jacobs
de04ad45ec Add one more parameter to avc_parse_nal_units so that it allows not to
free the input buffer.
This is required by upcoming extraction of isom_write_avcc to a function.

Originally committed as revision 11496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:00:04 +00:00
Aurelien Jacobs
ed7fa39c2d Check return value of avc_parse_nal_units().
Originally committed as revision 11495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 00:47:02 +00:00
Ronald S. Bultje
f739b36d16 Reindent after r11493 (always use parse_packet() vfunc in rtp_parse_packet()),
see "[PATCH] Realmedia / RTSP (RDT)" thread on ML.

Originally committed as revision 11494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 13:54:30 +00:00
Ronald S. Bultje
b4e3330c12 Make rtp_parse_packet() always call the vfunc of the dynamic payload handler
if there is one. See "[PATCH] Realmedia / RTSP (RDT)" thread on ML.

Originally committed as revision 11493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 13:52:35 +00:00
Luca Abeni
81ab1fa13e Pass a proper context to av_log()
Originally committed as revision 11485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 08:34:37 +00:00
Diego Biurrun
aa6b38c29d Fix random typos.
Originally committed as revision 11477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 23:08:51 +00:00
Guillaume LecrefECERF
727601bc4b url_write is part of the public API so it may not be under ifdef.
Also fixes a compile error if all muxers and protocols are disabled.
Patch by Guillaume LECERF (foxcore gmail com)

Originally committed as revision 11469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 22:07:59 +00:00
Baptiste Coudurier
e55a4dd328 check av_new_stream return value
Originally committed as revision 11463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 13:55:15 +00:00
Baptiste Coudurier
ebbe25d2a3 check av_new_stream return value
Originally committed as revision 11462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 13:48:52 +00:00
Ivo van Poorten
670c78479d Linux Media Labs MPEG-4 (LMLM4) demuxer
Originally committed as revision 11456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:52:51 +00:00
Ivo van Poorten
e03caf2efd Implement read_timestamp and enable seeking in PVA files.
Originally committed as revision 11455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:42:52 +00:00
Ivo van Poorten
ffc2934112 cosmetics
Originally committed as revision 11454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:40:04 +00:00
Ivo van Poorten
e661f76051 remove unnecessary check
Originally committed as revision 11453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:39:47 +00:00
Ivo van Poorten
9ae092036b use ff_parse_pes_pts for parsing an MPEG-PES timestamp
Originally committed as revision 11452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:38:12 +00:00
Ivo van Poorten
66e9e30239 Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
can easily be reused by other demuxers for formats that encapsulate MPEG-PES.

Originally committed as revision 11451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:32:57 +00:00
Aurelien Jacobs
4f632b065b Make ff_mkv_codec_tags lie entirely in .rodata section.
From: Diego 'Flameeyes' Pettenò < flameeyes _at_ gmail _dot_ com >

Originally committed as revision 11440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 00:03:19 +00:00
Diego Biurrun
c807e68f46 cosmetics: Add another pair of parentheses to aid readability.
Originally committed as revision 11437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06 22:50:09 +00:00