virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity
14,248 Commits 37 Branches 400 Tags 470 MiB
b146e17df5
Commit Graph

3435 Commits

Author SHA1 Message Date
Michael Niedermayer
591944cd0c Do a little more checking. 
Originally committed as revision 13502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 20:30:42 +00:00
Michael Niedermayer
e1dd8ac744 Do not read from after the table, fixes CID108 RUN2. 
Originally committed as revision 13501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 20:28:48 +00:00
Michael Niedermayer
884d53855d Null pointer check / CID26. 
Originally committed as revision 13488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:57:19 +00:00
Michael Niedermayer
7a7718e38f useless 
Originally committed as revision 13486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:53:23 +00:00
Michael Niedermayer
fce88d52ca Fixes NULL pointer dereference CID66 
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:10:34 +00:00
Michael Niedermayer
9d4cd3bfd5 Tell the user if a AVI is non interleaved. 
Originally committed as revision 13482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:07:41 +00:00
Baptiste Coudurier
efb533312f use internal video frame number 
Originally committed as revision 13479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:37:54 +00:00
Baptiste Coudurier
f2ecb775a7 cosmetics 
Originally committed as revision 13478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:34:31 +00:00
Baptiste Coudurier
003ae66086 simplify, use pointer to codec context in struct instead of only id 
Originally committed as revision 13477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:31:26 +00:00
Baptiste Coudurier
92f76fbf23 simplify, use pointer to codec context in struct instead of only id 
Originally committed as revision 13476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:31:09 +00:00
Michael Niedermayer
5e5c908691 redundant check-- 
Originally committed as revision 13474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 21:44:42 +00:00
Michael Niedermayer
c2a3dcaf25 Fix memleak, fixed CID123. 
Originally committed as revision 13472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 20:48:27 +00:00
Michael Niedermayer
406a0fdcab Do not use the pts/dts calculation code which needs a parser, when no parser 
is available.

Originally committed as revision 13470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 18:43:25 +00:00
Baptiste Coudurier
ed03be6c49 use AVFifoBuffer 
Originally committed as revision 13462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 04:33:48 +00:00
Baptiste Coudurier
2aaf590b17 cosmetics 
Originally committed as revision 13461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 03:42:55 +00:00
Baptiste Coudurier
11dae3365a merge init and declaration 
Originally committed as revision 13460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 03:41:51 +00:00
Baptiste Coudurier
4a712c3378 simplify and use version instead 
Originally committed as revision 13459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 03:11:31 +00:00
Baptiste Coudurier
6ef445fede simplify 
Originally committed as revision 13458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 03:00:40 +00:00
Baptiste Coudurier
8d4f0e6749 simplify 
Originally committed as revision 13457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 02:57:48 +00:00
Baptiste Coudurier
9caf6781ed cosmetics, remove useless cases and braces 
Originally committed as revision 13456 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 02:55:34 +00:00
Baptiste Coudurier
1234da4caf use av_fifo_generic_write, old func is deprecated 
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 01:26:22 +00:00
Baptiste Coudurier
fbcb081161 remove const qualifier, removes warning: 
libavformat/file.c:99: warning: passing argument 2 of 'strtol' from incompatible pointer type

Originally committed as revision 13454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 01:19:19 +00:00
Baptiste Coudurier
a077f3bc1a typo 
Originally committed as revision 13448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:59:28 +00:00
Diego Biurrun
f4433de9ef consistency cosmetics: indices --> indexes 
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:14:25 +00:00
Baptiste Coudurier
04fd3e8134 aac and h264 in flv demuxing 
Originally committed as revision 13439 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 22:01:41 +00:00
Baptiste Coudurier
f23496b562 aac and h264 in flv muxing 
Originally committed as revision 13438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 22:00:35 +00:00
Baptiste Coudurier
391872e467 aac chan config is 0 if bitstream contains program_config_element 
Originally committed as revision 13437 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 21:52:54 +00:00
Michael Niedermayer
2be83b96b6 Support non interleaved avi with phantom streams. 
Originally committed as revision 13436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 20:29:16 +00:00
Baptiste Coudurier
8999c833d1 replace printf by av_log 
Originally committed as revision 13425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 04:40:22 +00:00
Baptiste Coudurier
a299832f52 use av_hex_dump_log 
Originally committed as revision 13424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 04:38:46 +00:00
Baptiste Coudurier
ff978de47c use dprintf 
Originally committed as revision 13423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 04:34:29 +00:00
Baptiste Coudurier
376aefddad cosmetics, add demuxer word 
Originally committed as revision 13422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:57:07 +00:00
Baptiste Coudurier
58c37c30b4 cosmetics, remove useless dot 
Originally committed as revision 13421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:56:43 +00:00
Baptiste Coudurier
eea2f032ad return error if frame_offset is negative, prevent segfault 
Originally committed as revision 13420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:53:48 +00:00
Baptiste Coudurier
e5ece1831a return error if len is negative, prevent segfault 
Originally committed as revision 13419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:53:10 +00:00
Baptiste Coudurier
278f987a33 move ffserver specific functions up and only include unistd.h in this case 
Originally committed as revision 13418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:52:14 +00:00
Baptiste Coudurier
a1e01307ad move ffm_seek1 before get_pts function since func uses it 
Originally committed as revision 13417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:50:25 +00:00
Baptiste Coudurier
4adcbbbeef move DEBUG_SEEK definition before get_pts since func uses it 
Originally committed as revision 13416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:47:56 +00:00
Baptiste Coudurier
979b1a0611 move get_pts function to avoid useless declaration 
Originally committed as revision 13415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:47:07 +00:00
Baptiste Coudurier
ce2b665b3d remove unneeded include 
Originally committed as revision 13414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:46:06 +00:00
Baptiste Coudurier
85a6b01da4 split ffm de/muxer 
Originally committed as revision 13413 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:44:31 +00:00
Baptiste Coudurier
ba26712b5c reenable test, data is available in this case 
Originally committed as revision 13412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 03:37:01 +00:00
Justin Ruggles
b2677aa2a1 parse audio in ogm demuxer. 
fixes issue165.

Originally committed as revision 13407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:45:02 +00:00
Michael Niedermayer
c8b9377d15 Make ac3 in avi work better. 
fixes issue355.

Originally committed as revision 13406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:05:30 +00:00
Michael Niedermayer
fa3b98182d Ensure that one can store X bytes in a fifo of size X. 
Fixed issue417.

Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 23:04:09 +00:00
Michael Niedermayer
0871ae1a93 Make av_fifo*_read() ignore the available amount of data. 
This is more efficient as in practice the check is redundant most of the
time. Callers which do not know if enough data is available have to check
it with av_fifo_size(). Doing the check in *read() means the caller has
no choice to skip the check when its known to be redundant.
Also the return value was never documented in a public header so
changing it should not break the API. Besides this fixes the case where
read() failed on a 100% full fifo.

Originally committed as revision 13404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 22:20:39 +00:00
Baptiste Coudurier
a9ee86e79b set correct duration when using b frames 
Originally committed as revision 13372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-25 01:22:06 +00:00
Aurelien Jacobs
c2c3dedf6e compute the end of all chapters when end is not specified in the container 
Originally committed as revision 13363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 21:44:29 +00:00
Aurelien Jacobs
ebea1d7668 cosmetics: indentation 
Originally committed as revision 13280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 12:56:05 +00:00
Aurelien Jacobs
570745cc51 remove useless title check 
Originally committed as revision 13279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 12:55:36 +00:00
Baptiste Coudurier
5366f15d05 simplify, remove useless vars 
Originally committed as revision 13270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-24 00:03:00 +00:00
Baptiste Coudurier
fbabb0c277 add new h264 and aac flv ids 
Originally committed as revision 13269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 22:02:29 +00:00
Baptiste Coudurier
7ef94d221b in flv this field is dts finally 
Originally committed as revision 13268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 21:51:33 +00:00
Baptiste Coudurier
19719bc631 flv use 32 bit pts 
Originally committed as revision 13267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 21:47:30 +00:00
Michael Niedermayer
abd2256dbe Pass time_base as argument to new_chapter() as well. 
This fixes the wrong timebase the matroska demuxer had after my previous commits.
Maybe we should reduce new_chapter() to just (AVFormatContext, int id) ?

Originally committed as revision 13266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 18:15:13 +00:00
Michael Niedermayer
f6e76ba476 Document pts/dts. 
Originally committed as revision 13265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 17:56:45 +00:00
Michael Niedermayer
b18a4ab2ae Warn user about invalid timestamps. 
Originally committed as revision 13264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 17:52:42 +00:00
Michael Niedermayer
883fe4d5bb Chapter demuxing support. (untested as I have no nuts with chapters) 
Isn't that much simpler than Matroska?

Originally committed as revision 13263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:52:54 +00:00
Michael Niedermayer
5c37f43a0d Make ff_new_chapter() return AVChapter instead of int so its consistant with 
av_new_program() and its simpler to set other fields in AVChapter which arent
set by ff_new_chapter().

Originally committed as revision 13262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:14:11 +00:00
Michael Niedermayer
fbabf1e944 nb_chapters should be unsigned 
Originally committed as revision 13261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:08:44 +00:00
Michael Niedermayer
7c8202cc92 s/num_chapters/nb_chapters/ all other similar variables are called nb_*. 
Originally committed as revision 13260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:07:58 +00:00
Michael Niedermayer
747fb6c60c vertical align 
Originally committed as revision 13259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:04:12 +00:00
Michael Niedermayer
42720ee4d0 indent 
Originally committed as revision 13258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:52 +00:00
Michael Niedermayer
0dac708e2d remove useless title check 
Originally committed as revision 13257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:32 +00:00
Michael Niedermayer
6b43e2c7d3 indent 
Originally committed as revision 13256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:03:04 +00:00
Michael Niedermayer
7a2a3e8e40 Add id to AVChapter, untested (where do i find matroska files with chapters?). 
Originally committed as revision 13255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 13:02:27 +00:00
Michael Niedermayer
8931e7b48a clarify start/end timebase 
Originally committed as revision 13254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 12:45:03 +00:00
Michael Niedermayer
c2fb6be4a6 align comments 
Originally committed as revision 13253 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 12:44:12 +00:00
Michael Niedermayer
d2974f1676 chapter id and timebase 
Originally committed as revision 13252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 12:43:33 +00:00
Aurelien Jacobs
30897e764a don't set a dummy chapter title when title is unknown 
Originally committed as revision 13249 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 11:47:11 +00:00
Aurelien Jacobs
842ffee386 cosmetics: indentation 
Originally committed as revision 13248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 11:46:05 +00:00
Aurelien Jacobs
1ba056b689 allows adding chapters with NULL title 
Originally committed as revision 13247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 11:45:30 +00:00
Aurelien Jacobs
ad9d62ef22 matroskadec: allows inserting chapters with unspecified end 
Originally committed as revision 13242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 23:04:02 +00:00
Anton Khirnov
f5275b3ce7 demux chapters out of matroska 
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 22:07:09 +00:00
Anton Khirnov
79d7836a5e add support for chapters definition in lavf 
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 22:00:21 +00:00
Albert Astals Cid
6f04eb1e8a free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es 
Originally committed as revision 13237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 17:16:12 +00:00
Baptiste Coudurier
217e2f4679 remove useless var 
Originally committed as revision 13230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 22:54:36 +00:00
Baptiste Coudurier
42b9f45c0d 10l, fix compilation 
Originally committed as revision 13229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 22:53:52 +00:00
Baptiste Coudurier
5dae74e095 use duration from pkt 
Originally committed as revision 13228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 22:52:21 +00:00
Baptiste Coudurier
56b8a7b72a simplify 
Originally committed as revision 13227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 22:49:48 +00:00
Baptiste Coudurier
252c189bc4 simplify 
Originally committed as revision 13226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 22:48:33 +00:00
Baptiste Coudurier
2ea2340e34 check pkt stream index before returning packet, prevent segfault 
Originally committed as revision 13224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 21:04:42 +00:00
Carl Eugen Hoyos
392f227393 Do not loop endlessly if converting into dv with timestamps Jan 1st not 
immediately following a lapyear.

Patch by babupillai.
Fixes issue 443.

Originally committed as revision 13207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 07:05:08 +00:00
Lars Täuber
4860abb116 support dvd pcm 20/24 bits, patch by Lars Täuber, lars.taeuber gmx net 
Originally committed as revision 13206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 02:26:42 +00:00
Baptiste Coudurier
3e67f255a4 remove useless/obsolete comments 
Originally committed as revision 13205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 23:39:07 +00:00
Baptiste Coudurier
ad0b44b31a remove useless close function 
Originally committed as revision 13204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 23:32:22 +00:00
Baptiste Coudurier
3b35f4ab51 split swf de/muxer 
Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 23:31:10 +00:00
Baptiste Coudurier
585dac65db only print debug info when sample is actually added 
Originally committed as revision 13202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:24:02 +00:00
Baptiste Coudurier
285a3da9bd warn about multiple fourcc 
Originally committed as revision 13201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:22:44 +00:00
Baptiste Coudurier
978677a779 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451 
Originally committed as revision 13200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:21:29 +00:00
Aurelien Jacobs
54dddf095c matroskadec: add support for bzlib compressed tracks 
Originally committed as revision 13177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 23:12:41 +00:00
Baptiste Coudurier
3f60afad28 try to demux even if codec is not recognized, should demux M1F1-float32C-AFsp.aif and fix #454 
Originally committed as revision 13171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 22:47:40 +00:00
Baptiste Coudurier
0a1bd250d1 do not fail if correct is not recognized 
Originally committed as revision 13170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 22:37:31 +00:00
Baptiste Coudurier
24c1d3b54d cosmetics, remove space before opening parenthesis 
Originally committed as revision 13169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-15 22:14:29 +00:00
Aurelien Jacobs
2f79b4e8af add missing \n in av_log message 
Originally committed as revision 13152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 23:33:15 +00:00
Aurelien Jacobs
fbb878ce0f matroskadec: add support for zlib compressed tracks 
Originally committed as revision 13151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 23:32:13 +00:00
François Revol
7cf6af27c9 Fix non-debug build. 
Originally committed as revision 13149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 17:43:18 +00:00
Carl Eugen Hoyos
696c30688b Fix icc warning #188: enumerated type mixed with another type 
Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 15:51:37 +00:00
Carl Eugen Hoyos
e3227b3f25 Add MATROSKA_TRACK_TYPE_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-13 15:42:27 +00:00
Carl Eugen Hoyos
d9133126d3 Replace some occurrences of 0 with CODEC_ID_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-12 10:30:40 +00:00