ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-13 09:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,995 Commits 37 Branches 400 Tags 501 MiB
d68542f019
Commit Graph

4127 Commits

Author SHA1 Message Date
Ronald S. Bultje
3d883ad5f3 Reindent after r15833. 
Originally committed as revision 15834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:42:41 +00:00
Ronald S. Bultje
114732f4c7 Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in 
"[PATCH] RDT/Realmedia patches #2" thread.

Originally committed as revision 15833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:41:59 +00:00
Baptiste Coudurier
86b0affd08 simplify metadata reading 
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:17:19 +00:00
Aurelien Jacobs
8f569ed08f matroskadec: fix index timestamps for some broken files 
fix issue697

Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 15:34:51 +00:00
Ronald S. Bultje
6ff1f61530 Call check_back_and_send_rr() function only in case of RTP as a transport. 
Don't call it for RDT, since it is unneeded and it doesn't provide a
RTPDemuxContext, leading to some memory errors. See "[PATCH] fix small
memory error in rtsp.c" thread on ML.

Originally committed as revision 15828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 14:44:48 +00:00
Ronald S. Bultje
239dec21ab Rename variables in ff_rdt_parse_header() and callers to match the 
comment documentation in that function. See discussion on ML in the
"[PATCH] RDT/Realmedia patches #2" thread.

Originally committed as revision 15825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 02:22:47 +00:00
Jindřich Makovička
7d0842992a check for interrupt when receiving from socket 
Originally committed as revision 15824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-14 19:33:22 +00:00
Ronald S. Bultje
9e16439287 Add comment describing the RDT packet header. See discussion in "[PATCH] 
RDT/Realmedia patches #2" thread on the mailinglist.

Originally committed as revision 15823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-14 18:37:58 +00:00
Baptiste Coudurier
eb63b051c0 timestamp is dts in wmv/asf 
Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-14 03:45:31 +00:00
Jindřich Makovička
236bb1ab01 Allow the UDP socket buffer size to be adjusted using a 
'buffer_size' URL option.

Patch by Jindrich Makovicka, makovick at gmail dot com

Originally committed as revision 15807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-12 21:40:53 +00:00
Jindřich Makovička
f5edd874fa always use the whole buffer for reading w/ packetized sources to avoid packet truncation 
Originally committed as revision 15799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-10 21:41:35 +00:00
Stefano Sabatini
15545a095a Fix argument constness for the av_codec_get_id() and 
av_codec_get_tag() functions, making them take in input a constant
array, since they're not supposed to change it. Fix some warnings.

Originally committed as revision 15795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-08 18:37:03 +00:00
Peter Ross
d2299316ce Electronic Arts demuxer: support TGQ video tags 
Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-08 00:39:31 +00:00
Måns Rullgård
e3b07e1a74 OGG: correct PTS with old theora streams 
Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-06 01:57:17 +00:00
Måns Rullgård
77be08eeb1 OGG: untypedef demuxer structs 
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-06 01:50:56 +00:00
Peter Ross
4fd71a0ee8 Decode audio channel layout from RIFF/WAV file format. 
Originally committed as revision 15774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-05 09:22:13 +00:00
Michael Niedermayer
f23938f5b7 Check sub_packet_size against 0 to avoid div by zero later. 
Fixes issue473

Originally committed as revision 15739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-29 00:16:50 +00:00
Andrew Wason
8ff8de73a4 Fix endless loop when opening corrupt FLV files (issue 699). 
Patch by Andrew Wason, rectalogic A rectalogic D com

Originally committed as revision 15738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-28 23:49:04 +00:00
Baptiste Coudurier
785b0f3c54 fix umid base value, use revision 5 and generic material type 
Originally committed as revision 15723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-27 00:21:42 +00:00
Baptiste Coudurier
0df4903a07 fix sound essence compression UL 
Originally committed as revision 15721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-26 23:59:28 +00:00
Baptiste Coudurier
1d30d1ad4d fix start position UL 
Originally committed as revision 15720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-26 23:57:41 +00:00
Baptiste Coudurier
7f8cd075e0 simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz 
Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 23:06:03 +00:00
Diego Biurrun
f94036f159 prettyprinting cosmetics 
Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 21:41:27 +00:00
Diego Biurrun
75f2c20983 spelling cosmetics 
Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 21:37:06 +00:00
Baptiste Coudurier
f96d0eef53 force sample rate to 16khz for speex in flv, fix speexaudio.flv 
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 18:36:26 +00:00
Pascal Massimino
4fe8a45240 fix for >2GB flv files 
Originally committed as revision 15677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 16:46:43 +00:00
Baptiste Coudurier
bd09e8a7df raw dnxhd de/muxer 
Originally committed as revision 15674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 01:42:57 +00:00
Baptiste Coudurier
b774fdd7a4 dnxhd codec is intra only 
Originally committed as revision 15672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-23 17:30:36 +00:00
Aurelien Jacobs
abce34d979 matroskaenc: require global header 
fixes issue696

Originally committed as revision 15667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-22 21:14:42 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Michael Niedermayer
9806f846c0 Check for pts==dts on I/P frames in the presence of non low delay decoding and 
discard these invalid timestamps.
fixes issue171.

Originally committed as revision 15641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-19 01:02:48 +00:00
Michael Niedermayer
f781f748b9 Move code setting delay and presentation_delayed a little up so 
that the variables are available sooner.

Originally committed as revision 15640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 22:41:21 +00:00
Michael Niedermayer
4589dc5c4d Append read data onto the buffer instead of overwriting, this ensures 
that the whole buffer is available for seeking back.
Fixes issue480

Originally committed as revision 15634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 17:30:37 +00:00
Alexander Wichers
8ddd280d2d Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu 
Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 12:10:08 +00:00
Alexander Wichers
88cb61bb0c 8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu 
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 12:08:55 +00:00
Michael Niedermayer
bf9067cf3e Assume mono if no other information for raw. 
Should fix issue687

Originally committed as revision 15631 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 10:40:31 +00:00
Ramiro Polla
bc574408dc Only special-case absolute DOS paths on systems that support them. 
Originally committed as revision 15594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-10 16:59:37 +00:00
Michael Niedermayer
51f4155fef Make gcc 2.95 happy. 
Originally committed as revision 15589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 20:55:22 +00:00
Roman Shaposhnik
4e92dabf60 replacing frame_rate and frame_rate_base with an AVRational time_base 
Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 16:59:18 +00:00
Roman Shaposhnik
a53621fca8 simplifying code as per Michael's suggestion 
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 16:14:33 +00:00
Roman Shaposhnik
c9b0b38f45 simplifying the code as per Michael's suggestion 
Originally committed as revision 15577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 15:49:45 +00:00
Baptiste Coudurier
5b9ce252a9 10l, fix amrwb sample rate 
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 23:30:35 +00:00
Aurelien Jacobs
b7f4e76d3d matroskaenc: correct muxing of ASS packets 
- split packets to store one ASS event line per Matroska block
 - reformat ASS events to Matroska modified format
 - extract display duration for ASS events to store as Matroska block duration

Originally committed as revision 15561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:57:56 +00:00
Aurelien Jacobs
291902c274 matroskaenc: use correct EBML ID for block duration 
Originally committed as revision 15560 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:47:10 +00:00
Aurelien Jacobs
1bfbe8ff9d matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size() 
Originally committed as revision 15559 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:44:50 +00:00
Aurelien Jacobs
8401c51407 matroskaenc: remove useless mkv_block_size() function 
Originally committed as revision 15558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:41:58 +00:00
Michael Niedermayer
7ccc636f03 Favor even chunk sizes in ambiguous cases. 
Fixes transcode_069_produces_uneven_chunk_size.avi.

Originally committed as revision 15557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 22:26:43 +00:00
Michael Niedermayer
f080a7bd90 Factorize stream id parsing. 
Originally committed as revision 15556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 21:57:01 +00:00
Reimar Döffinger
6bc03a695b Make size variables in dyn_buf_write unsigned so gcc will not optimize the 
check away (due to assuming signed overflows do not happen).

Originally committed as revision 15555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 21:11:58 +00:00
Diego Biurrun
95137bbbb4 Fix 'make checkheaders', based on a patch by Diego Pettenò, flameeyes gmail com. 
Originally committed as revision 15552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 11:20:02 +00:00
Ronald S. Bultje
5c918b2775 Reindent after r15544. 
Originally committed as revision 15545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:19:46 +00:00
Ronald S. Bultje
accc248f28 Implement RDTDemuxContext, which contains RDT-specific data (similar to 
RTPDemuxContext for RTP) for these streams where the transport protocol
is RDT (as served by Realmedia servers).

Originally committed as revision 15544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:19:15 +00:00
Ronald S. Bultje
5465b0d474 Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport) 
and making its type a void pointer. See discussion in "RDT/Realmedia patches
#2" thread on ML.

Originally committed as revision 15543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:17:59 +00:00
Ronald S. Bultje
99a1d1915e Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque 
(and thus preparing for the introduction of RDTDemuxContext) in a next patch.
See discussion in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:16:44 +00:00
Ronald S. Bultje
9b932b8ac0 Change function prototype of RTPDynamicPayloadHandler.parse_packet() to 
not use RTPDemuxContext, but rather take a pointer to the payload context
directly. This allows using payload handlers regardless over the transport
over which they were sent, and prepares for the introduction of a future
RDTDemuxContext. See discussion in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:15:06 +00:00
Ronald S. Bultje
ed0aacc76e Rename RTP payload contexts to PayloadContext, suggested by Luca in 
"RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 04:11:12 +00:00
Baptiste Coudurier
f06188d5ee set sample rate for amr to allow stream copy since no decoder is present, 
3gp does not store sample rate in stsd in fact. Fixes #674.

Originally committed as revision 15536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 19:37:41 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Aurelien Jacobs
c58e8bd3c3 matroskadec: cosmetics: indentation 
Originally committed as revision 15529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 21:15:48 +00:00
Aurelien Jacobs
21a115d17b matroskadec: don't merge packets which have no timestamp 
Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 21:14:56 +00:00
Diego Pettenò
72ab9d7f60 Use __typeof__ instead of GCC-specific typeof keyword. 
The typeof keyword is disabled by default when building with -std=c99
as it's a GNU extension.
ICC supports the __typeof__ keyword as well as typeof.

Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com%

Originally committed as revision 15527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 20:01:13 +00:00
Ramiro Polla
3defa81fc4 MinGW runtime 3.15 has a wrapper for usleep(). 
Originally committed as revision 15522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 17:43:27 +00:00
Diego Biurrun
910f02a054 spelling cosmetics 
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:28:58 +00:00
Diego Pettenò
fb65d2ca84 Use enum typers instead of int. 
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:03:00 +00:00
Reimar Döffinger
9b5ede5b64 Add (additional) const to many global tables. 
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 15:52:04 +00:00
David Conrad
a0ce2d1bbc Cosmetics: indentation 
Originally committed as revision 15501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 14:44:30 +00:00
David Conrad
277e3e534b Visible width/height fields were added in Theora 3.2 
Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 14:43:08 +00:00
Ronald S. Bultje
3ff2a06228 Use parse_packet vfunc in RTPDynamicProtocolHandler instead of hardcoding 
the use of rdt_parse_packet(). See "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 12:38:41 +00:00
Ronald S. Bultje
985b05d3c9 This patch refactors RDT packet header parsing so that it can be used in 
rtsp.c to detect the ID of the packet source also in case of TCP streams.
This allows proper playback of RDT streams with multiple stream types, e.g.
audio + video. Accepted by LucaB in "RDT/Realmedia patches #2" thread on ML.

Originally committed as revision 15496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 12:37:07 +00:00
Ronald S. Bultje
f5f1e97f33 Reindent after previous patches. 
Originally committed as revision 15485 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:27:19 +00:00
Ronald S. Bultje
119b466811 Implement a RTSPTransport field, which allows proper separation of server 
types and their non-standard extensions, and the data they serve. Practically,
this patch allows Real servers to serve normal non-RDT (standard RTP) data.
See discussion on ML in "Realmedia patch" thread.

Originally committed as revision 15484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:26:20 +00:00
Ronald S. Bultje
ab63fb0360 Remove access to rdt_data struct in functions called outside of the 
DynamicProtocol* context. Doing so could lead to problems if we're accessing
Real servers serving non-RDT data (or the other way around). Temporarily,
this patch adds a _subscribe2() function which will soon be removed in one
of the subsequent commits. OK'ed by Luca in "Realmedia patch" thread on ML.

Originally committed as revision 15483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:23:33 +00:00
Ronald S. Bultje
eee2cbff77 Send improper UDP SETUP request, which is what Realmedia servers expect. 
See discussion on ML in "Realmedia patch" thread.

Originally committed as revision 15482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:20:23 +00:00
Ronald S. Bultje
90abbdba1e Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us 
that it only describes the lower-level transport (TCP vs. UDP) and not the
actual data layout (e.g. RDT vs. RTP). See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 13:18:41 +00:00
Baptiste Coudurier
0c5f76f708 support negative ctts in some way, unset wrong dts 
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 02:44:57 +00:00
Diego Biurrun
d0feff2a5b Uniformly define _XOPEN_SOURCE to 600. 
The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort
the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well
as POSIX.1-2001), and will only accept it to be defined to 600.
inspired by a patch from Diego Pettenò, flameeyes gmail com

Originally committed as revision 15460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-29 06:22:12 +00:00
Aurelien Jacobs
d5e34dcb72 matroskadec: merge ASS events which share the same pts in the same AVPavket 
Originally committed as revision 15455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 23:06:25 +00:00
Aurelien Jacobs
3df2be9fa7 matroskadec: ass events lines must end with a DOS style EOL 
Originally committed as revision 15454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 23:01:07 +00:00
Aurelien Jacobs
1bb4a1a1c4 matroskadec: set duration only for CODEC_ID_TEXT subtitles 
Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 22:58:53 +00:00
Aurelien Jacobs
e7d4b7431d matroskadec: pass duration as parameter of matroska_fix_ass_packet() 
Originally committed as revision 15452 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 22:55:28 +00:00
Aurelien Jacobs
7a8b7634c5 assdec: don't remove CR, they are part of the spec 
Originally committed as revision 15442 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-27 23:12:24 +00:00
Diego Biurrun
78cb727302 cosmetics: Break overly long lines, one grammar fix. 
Originally committed as revision 15441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-27 20:05:12 +00:00
Diego Biurrun
4f57fa8c03 spelling/wording/grammar 
Originally committed as revision 15440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-27 19:51:53 +00:00
Diego Biurrun
fff5e687a1 Move doxygen comments for av_gettime from utils.c to avformat.h. 
Originally committed as revision 15439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-27 17:37:22 +00:00
Michael Niedermayer
88caf34510 ASS/SSA muxer. 
Originally committed as revision 15430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 19:42:21 +00:00
Benjamin Larsson
2426bb960a add ok parts to the rm demuxer for SIPRO support 
Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 12:12:25 +00:00
Benjamin Larsson
faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work 
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 10:59:42 +00:00
Michael Niedermayer
5c8a1d1927 Do not lose the '\n'. 
Originally committed as revision 15424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 03:24:05 +00:00
Michael Niedermayer
de3ae185a4 2 in 1, an ASS and SSA demuxer. 
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2).

Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 02:19:21 +00:00
Baptiste Coudurier
6ad1c9c992 only include sys/select.h if present, fix mingw compilation 
Originally committed as revision 15420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 02:12:37 +00:00
Michael Niedermayer
644b0c4c92 Prevent image2 from complaining about non monotone timestamps as 
there are no timestamps in "raw" image2.

Originally committed as revision 15419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 02:07:56 +00:00
Baptiste Coudurier
fe28178303 cosmetics, remove GXF: in log messages since it is present in context 
Originally committed as revision 15409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 23:40:55 +00:00
Baptiste Coudurier
99f296b304 skip invalid audio samples in gxf packets 
Originally committed as revision 15408 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 23:31:04 +00:00
Baptiste Coudurier
c75a0cce5b include sys/select.h to get select, according to posix 2001, 
fix compilation on freebsd 5.5

Originally committed as revision 15406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 22:11:53 +00:00
Baptiste Coudurier
933bd8e291 include sys/select.h instead of unistd.h to get select, 
according to posix 2001, fix compilation on freebsd 5.5

Originally committed as revision 15405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 22:08:50 +00:00
Baptiste Coudurier
4e240985d8 stop parsing if tag size is wrongly < 8 to avoid infinite loop 
Originally committed as revision 15401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 18:55:00 +00:00
Michael Niedermayer
f2d65a6c8a Avoid segfault due to not set AVCodec. 
Originally committed as revision 15400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:46:23 +00:00
Baptiste Coudurier
aeb627888d merge amr wb case with amr nb and qcelp 
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:17:11 +00:00
Baptiste Coudurier
26f5e1469f do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz 
Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:09:59 +00:00
Michael Niedermayer
f26be47740 ASF stands for "advanced stream format" not "adaptive ...", changing it to "ASF". 
Originally committed as revision 15395 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 12:03:25 +00:00
Vitor Sessak
b93dd8383a Add support for RVTR fourCC 
Originally committed as revision 15386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-23 06:24:00 +00:00
Michael Niedermayer
0354ddb71c Ensure that muxer and encoder aspect ratios match. So no 
invalid files are generated.

Originally committed as revision 15367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-19 12:37:38 +00:00
Kostya Shishkov
b30cb420cf Add fourcc for MS RLE4 
Originally committed as revision 15357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 05:25:29 +00:00
Baptiste Coudurier
5813a29eb1 revert r14983, value is not sample aspect ratio, it is display aspect ratio 
Originally committed as revision 15352 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-17 23:14:48 +00:00
Justin Ruggles
e1a12934c5 write number of samples in FLAC extradata. 
based on a patch by Mathieu Velten (matmaul gmail com).

Originally committed as revision 15324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 20:00:36 +00:00
Justin Ruggles
5165651cf9 add error message for unsupported codecs in WAVE. 
Resolves issue 623.

Originally committed as revision 15322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 17:29:34 +00:00
Ronald S. Bultje
2834c365d2 Reindent after r15317. 
Originally committed as revision 15318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 13:56:12 +00:00
Ronald S. Bultje
2e889ae4b9 Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport 
protocol) is not strictly related to the server type (Real servers can
stream both RDT and RTP).

Originally committed as revision 15317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 13:55:21 +00:00
Aurelien Jacobs
a8fd7e764a matroskadec: simplify, first_timecode is already in the index 
no need to duplicate it

Originally committed as revision 15302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-12 00:06:06 +00:00
Aurelien Jacobs
5358a81f9c matroskadec: prevent seeking before the first keyframe of the reference stream 
Originally committed as revision 15301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-11 22:42:17 +00:00
Ronald S. Bultje
a6789dca1b Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1: 
remove duplicate code" thread on ML.

Originally committed as revision 15298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-11 17:43:44 +00:00
Ronald S. Bultje
ee0cb67fa3 Factorize out common code for opening of the RTP parsing context between 
SDP and RTSP into a new function. See discussion on ML in "[PATCH] rtsp
cleanup part 1: remove duplicate code" thread.

Originally committed as revision 15297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-11 17:43:04 +00:00
Michael Niedermayer
e7f656d5fa Clarify convergence_duration. 
Originally committed as revision 15291 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-10 12:51:49 +00:00
Baptiste Coudurier
00adc1e5dc set bits_per_coded_sample according to new lavc api 
Originally committed as revision 15289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 18:32:50 +00:00
Aurelien Jacobs
c16582579b matroskadec: demux relevant subtitle packets after a seek 
only works for subtitle tracks which were properly indexed up to the seek point

Originally committed as revision 15284 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 12:10:25 +00:00
Aurelien Jacobs
82360e670d matroskadec: ensure that overlapping subtitles are not added to the index 
Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 12:07:10 +00:00
Aurelien Jacobs
20f7466550 matroskadec: after seeking, skip up to the desired timestamp instead of 
the desired stream

Originally committed as revision 15282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 12:01:51 +00:00
Aurelien Jacobs
f14a201b32 matroskadec: move timecode calculation a little earlier 
so as to be able to use it in other part of the code

Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 11:54:35 +00:00
Aurelien Jacobs
3fc9d7cec4 matroskadec: sanitize track time_scale before using it 
fix issue628

Originally committed as revision 15280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 11:23:48 +00:00
Baptiste Coudurier
66ec3d56a2 print stream index in decimal not in hex, easier for debugging 
Originally committed as revision 15279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-09 02:56:13 +00:00
Baptiste Coudurier
bf912a482b set block align in av_write_header if not set, fix issue #489 
Originally committed as revision 15277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 19:37:22 +00:00
Baptiste Coudurier
bed4fc54c9 write copyright metadata tag 
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 19:11:53 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Baptiste Coudurier
1993f8d640 terminate tag tables by CODEC_ID_NONE 
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 00:58:24 +00:00
Baptiste Coudurier
24b8aa84d0 set default bps to 16 in wav header 
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 04:17:15 +00:00
Ronald S. Bultje
4fce284c08 Implement RDT-specific data parsing routines. After these changes, simple 
playback of RTSP/RDT streams should work. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 01:25:47 +00:00
Ronald S. Bultje
99b2ac0797 Reindent after previous patch. 
Originally committed as revision 15236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 01:24:01 +00:00
Ronald S. Bultje
1256d16b6c Implement a RDT-specific SET_PARAMETER command that subscribes to the 
first stream in a RTSP/RDT session. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 01:22:18 +00:00
Ronald S. Bultje
ff13ba92fd Add dynamic payload handlers to rdt.c. These follow the same API as the ones 
in rtpdec.c, so that they can be shared and used in the same way in rtsp.c.
The handlers, since they are specific for RDT, are registered in rdt.c and
a new registration function is thus called from allformats.c.

The dynamic payload handler also implements RDT-specific SDP-line parsing for
OpaqueData and StartTime, which are specific for RDT and needed for proper
playback. OpaqueData contains one or a list ("MLTI") of "MDPR" chunks that
can be parsed by the rmdec.c function ff_rm_read_mdpr_codecdata(). To use
this function, we create a new rdt_demuxer, which has the same private data
as the rm_demuxer. The resulting AVFormatContext created with _open_stream()
can thus be used to call functions in the RM demuxer.

See discussion in "Realmedia patch" thread on ML.

Originally committed as revision 15234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 01:21:24 +00:00
Ronald S. Bultje
0369d2b045 Give register_dynamic_payload_handler() in rtpdec.c a ff_ prefix and export 
it so that I can use it in rdt.c as well. See discussion in "Realmedia patch"
thread on ML.

Originally committed as revision 15233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 01:19:26 +00:00
Aurelien Jacobs
74cf481970 bump lavf micro version to allow checking for the matroska/ASS bugfix in r15211 
Originally committed as revision 15232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 00:05:30 +00:00
Aurelien Jacobs
a3467f8608 matroskadec: remove now useless vstream and is_video_key_frame 
Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-06 23:44:29 +00:00
Aurelien Jacobs
dbfb0e5f36 matroskadec: remove useless braces 
Originally committed as revision 15230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-06 23:43:24 +00:00
Aurelien Jacobs
24c3da1637 matroskadec: ensure that the timecode added to the index are is the one 
of the actual keyframe block, and not the one of the start of the cluster
containing this block.

Originally committed as revision 15229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-06 23:39:59 +00:00
Baptiste Coudurier
cf74dd4a5c do not fail if audio is uncompressed and frame size is not set, just set it 
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 02:30:27 +00:00
Baptiste Coudurier
235a51ad31 simplify bps code by using av_get_bits_per_sample 
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 02:20:33 +00:00
Aurelien Jacobs
3eb9bfbb84 matroskadec: fix ASS subtitle track packets before emitting them 
Matroska does some butchering when storing the ASS lines. The start and end
time are removed (because they are duplicated in the container).
The matroska_fix_ass_packet() function simply restore those start and end
time in ASS lines to ensure our ASS packets comply with the ASS spec.

Originally committed as revision 15211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:26:12 +00:00
Baptiste Coudurier
52cf395407 Fix msgsm in wav, do not set blkalign to frame size, this is wrong, 
all samples have correct blkalign set to 65

Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:19:53 +00:00
Aurelien Jacobs
62c24705c8 matroska: subtitle display duration must be stored in pkt->convergence_duration 
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:08:19 +00:00
Baptiste Coudurier
5d79f30d70 set block align and frame size for gsm in aiff 
Originally committed as revision 15203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 22:35:05 +00:00
Baptiste Coudurier
efa1fb39d2 cosmetics, remove whitespace 
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:26:31 +00:00
Kurtnoise
4ed1942008 actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr 
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:25:55 +00:00
Damiano Galassi
544a0f47af skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits, 
patch by Damiano Galassi, damiog at gmail dot com

Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:17:21 +00:00
Baptiste Coudurier
c4e02d702c change the logic to mux 13818-3 and 11172-3 in mp4, less code 
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:42:09 +00:00
Baptiste Coudurier
e00c3de821 forbid mp3 < 16000hz in anything except mov 
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:31:03 +00:00
Baptiste Coudurier
c3b1325158 dirac muxing support in mp4/mov 
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:23:24 +00:00
Baptiste Coudurier
5180b027cc cosmetics, move up mpeg1video mp4 objecttype 
Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:18:49 +00:00
Baptiste Coudurier
2f980d2a83 cosmetics, change values to hex since mp4ra use hex 
Originally committed as revision 15186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:17:28 +00:00
Baptiste Coudurier
baa0be4cf0 cosmetics, vertical align 
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:08:56 +00:00
Baptiste Coudurier
d4a240cbc9 ac3 muxing support in mov/mp4/m4v 
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:05:22 +00:00