videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-23 20:51:29 +02:00
Code Releases Activity
15,782 Commits 36 Branches 392 Tags 210 MiB
fb17d9ff54
Commit Graph

3891 Commits

Author SHA1 Message Date
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
Reimar Döffinger
dc76fe1348 Change doxygen comment: Clarify when av_write_trailer should be called. 
Originally committed as revision 15181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 17:57:56 +00:00
Michael Niedermayer
a2636c0fd5 Add AVPacket.convergence_duration. 
Originally committed as revision 15179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 14:44:54 +00:00
Michael Niedermayer
a82630deb2 Try to clarify the semantics of AVPacket.duration. 
Originally committed as revision 15178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 14:02:17 +00:00
Ronald S. Bultje
0ad306bc81 Remove unused code that used to handle protocol concatenation, i.e. trying 
multiple protocols at the same time. We now cycle protocols individually
to autodetect, making this code no longer needed, and thus the support code
for it in make_setup_request() can be removed. See "[PATCH] remove transport
concatenation dead code" on mailinglist.

Originally committed as revision 15172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 04:47:44 +00:00
Ronald S. Bultje
e9dea59f16 Implement Realmedia/RTSP-compatible SETUP command. This includes calculation 
of the "RealChallenge2" response, which is some sort of authentication. See
discussion in "Realmedia patch" thread on ffmpeg-devel.

Originally committed as revision 15170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 04:44:58 +00:00
Baptiste Coudurier
bea6c1ec80 fix fourcc comment 
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 01:42:26 +00:00
Ronald S. Bultje
1599503043 Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is 
shared between the RM demuxer and the RTSP/RDT parser; both use the same
timebase. See discussion in "[PATCH] rmdec.c: move av_set_pts_info()" on ML.

Originally committed as revision 15164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 00:07:34 +00:00
Ronald S. Bultje
79d5045d33 Use chunk-size in function calling mdpr_read_codecdata() rather than in the 
function itself. This way, old-style (.ra4) RTSP/RDT OpaqueData chunks can
be parsed using this function as well (they don't have the size bits). See
discussion on ML in "[PATCH] rmdec.c - small read_mdpr_codecdata() API
modification".

Originally committed as revision 15163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 00:05:55 +00:00
Laurent Aimar
d1c2156bc6 Fix an invalid free in the AVI muxer when an unsupported audio track is added. 
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 22:53:42 +00:00
Diego Biurrun
8212568a1c Replace generic CONFIG_MUXERS preprocessor conditionals by more specific 
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 22:45:13 +00:00
Diego Biurrun
c184318852 Remove pointless #ifdef CONFIG_VHOOK from the code. 
The file is only ever compiled if CONFIG_VHOOK is set.

Originally committed as revision 15157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 22:31:41 +00:00
Baptiste Coudurier
dfce888f8a correctly mux mpeg2 audio 13818-3 in mp4 
Originally committed as revision 15156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 20:48:45 +00:00
Baptiste Coudurier
428626d5d1 allow mp2 to be muxed into mp4 
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 19:13:25 +00:00
Michael Niedermayer
74aa41bae4 Fix detection of MPEG4 in MPEG-PS. 
Fixes issue568.

Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 15:33:57 +00:00
Justin Ruggles
bdf6972c4b change back to using CONFIG_*_DEMUXER for ac3_eac3_probe(), but use it 
correctly this time.

Originally committed as revision 15147 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 17:20:49 +00:00
Aurelien Jacobs
23cdcb22a3 matroska: add E-AC-3 support 
Thanks again Justin !

Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 15:50:12 +00:00
Aurelien Jacobs
75198e7a6d simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs. 
Originally committed as revision 15145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 15:31:14 +00:00
Justin Ruggles
4d951ef86d check ENABLE_*_DEMUXER instead of CONFIG_*_DEMUXER 
Originally committed as revision 15144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 15:28:15 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3 
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 14:33:54 +00:00
Ronald S. Bultje
5f86057ffd Remove useless "else" case in if X { A; return }; else { B }. See discussion 
in "Realmedia patch" thread on mailinglist.

Originally committed as revision 15142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 13:51:24 +00:00
Ronald S. Bultje
d6bb9ebdc6 Some RTSP streams use SDP lines longer than 1024 bytes, so the SDP line 
buffer needs to be increased. See discussion in "Realmedia patch" thread
on mailinglist.

Originally committed as revision 15141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 13:47:53 +00:00
Ronald S. Bultje
897ade1ba9 Implement Realmedia-compatible DESCRIBE command. 
Originally committed as revision 15140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 13:46:50 +00:00
Baptiste Coudurier
e8c4df40e3 check for malloc failure 
Originally committed as revision 15132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:21:00 +00:00
Baptiste Coudurier
db568c079a copy whole frame in vosData for dnxhd, this code will be used for other codecs too 
Originally committed as revision 15131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:20:12 +00:00
Ronald S. Bultje
1cf151e9ae Send RTSP OPTIONS command to detect server type. 
Originally committed as revision 15125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 17:32:58 +00:00
Ronald S. Bultje
30aa6aed4a Read RealChallenge1 field from the server. 
Originally committed as revision 15124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 17:32:02 +00:00
Ronald S. Bultje
e077604335 Implement RTSPServerType enum as a way to identify the flavour of RTSP that 
the server will send to us (standard-compliant RTP or Realmedia-style RDT).

Originally committed as revision 15123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 17:30:15 +00:00
Ronald S. Bultje
75128a2273 Revert back to old version (r15103). 
Originally committed as revision 15122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 17:23:01 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Baptiste Coudurier
b18783644c do no write multi descriptor when only one track is present 
Originally committed as revision 15115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:35:09 +00:00
Baptiste Coudurier
6ae9d3faae factorize 
Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:26:12 +00:00
Baptiste Coudurier
f05773ea8f remove mxf_build_structural_metadata, simplify 
Originally committed as revision 15113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:25:39 +00:00
Baptiste Coudurier
98f7c5e067 move mxf_write_package to permit function merge 
Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:24:00 +00:00
Baptiste Coudurier
a4d7a6781a cosmetics, Pair -> Entry 
Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:20:47 +00:00
Baptiste Coudurier
d4ffc57d39 store index in table in MXFStreamContext, simplify 
Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:13:44 +00:00
Baptiste Coudurier
f2ebd15952 merge descriptor write table with essence container uls table and simplify 
Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 04:07:41 +00:00