generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,514 Commits 24 Branches 241 Tags
Commit Graph

4301 Commits

Author SHA1 Message Date
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