ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-08 18:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,126 Commits 37 Branches 400 Tags 498 MiB
74498eb44b
Commit Graph

3403 Commits

Author SHA1 Message Date
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
Diego Pettenò
3375a6a597 Use strcasecmp() instead of re-inventing it. 
Patch by Diego 'Flameeyes' Pettenò flameeyesATgmailPOINTcom

Originally committed as revision 13132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-12 01:17:00 +00:00
Luca Abeni
397db8ac5e Fix type of dest_addr_len to respect return value of udp_set_url. 
Patch by Luca Abeni.

Originally committed as revision 13114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 10:53:21 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Jai Menon
86b2d47fc0 IFF stereo support 
Patch by Jai Menon ( realityman gmx net )

Originally committed as revision 13097 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:25:27 +00:00
Diego Biurrun
f38c6c6cab string.h is a system header file, so use <> for it. 
Originally committed as revision 13091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 09:30:43 +00:00
Aurelien Jacobs
b9a7da77ec use enum type instead of int 
Originally committed as revision 13089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 01:59:33 +00:00
Aurelien Jacobs
db26212676 cosmetics: indentation 
Originally committed as revision 13088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 01:54:35 +00:00
Aurelien Jacobs
de3230fb96 matroskadec: add support for lzo compressed tracks 
Originally committed as revision 13087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 01:53:59 +00:00
Aurelien Jacobs
5d2b12f6de matroskadec: fail gracefully when seeking don't work 
Originally committed as revision 13085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-08 23:11:13 +00:00
Aurelien Jacobs
53a1e82bd2 matroskadec: add support for track content encoding 
Only the header strip method is supported for now.

Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-08 21:47:31 +00:00
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +00:00
Michael Niedermayer
abbae514e1 Check url_seek() in url_open(). 
Originally committed as revision 13061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-05 09:17:56 +00:00
Diego Biurrun
4b13335d1c Use correct length modifier for pointer diff argument in av_log() call. 
Originally committed as revision 13057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-04 10:35:13 +00:00
Diego Pettenò
d6f142a1f8 Fix 'comparison always false' warning. 
patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

Originally committed as revision 13056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-04 10:29:12 +00:00
Benjamin Larsson
fde8052e4e dts probe 
Originally committed as revision 13040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-03 00:12:32 +00:00
Bartlomiej Wolowiec
b7d1cd02e3 Nellymoser handling in FLV 
Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-02 19:35:31 +00:00
Luca Barbato
17ac9f1c38 Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards, 
patch extracted by Anuradha Suraparaju anuradhaAtrdDoTbbcDoTcoDoTuk.

Originally committed as revision 13031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-02 14:52:39 +00:00
Justin Ruggles
8a0684f4c4 fix encoding of flac private data 
Originally committed as revision 13030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-01 22:04:17 +00:00
Michael Niedermayer
b22d0c04d7 Support invalid mpeg created by vdr 
(http://www.lucke.in-berlin.de/test_streams/last_played_fine_with_r7852_001.vdr).
fixes issue434

Originally committed as revision 13014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-29 00:12:49 +00:00
Michael Niedermayer
60711e9599 raw GSM demuxer (does not work yet as parser is missing) 
Originally committed as revision 13013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-28 18:29:42 +00:00
Baptiste Coudurier
a0af2fa445 set demuxers .value and use common audio_read_header function 
Originally committed as revision 13012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-28 14:14:44 +00:00
Henrik Gulbrandsen
e8430214c3 set pkt duration, only when dts == pts though, 
patch by Henrik Gulbrandsen henrik at gulbra dot net

Originally committed as revision 13003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 17:51:02 +00:00
Kostya Shishkov
c5497b22b7 Missing tags in APE is normal situation, so don't print an error. 
Resolves issue 437

Originally committed as revision 12977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 06:29:56 +00:00
Baptiste Coudurier
eb034aca18 yes it is true for mp4 
Originally committed as revision 12972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:52:30 +00:00
Baptiste Coudurier
43612ffe25 remove unneeded variable 
Originally committed as revision 12971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:50:06 +00:00
Baptiste Coudurier
baf9fb32c0 move vars decls where vars are used 
Originally committed as revision 12970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:47:22 +00:00
Baptiste Coudurier
45a97d3018 set channels and sample rate from mpeg4audio config 
Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:09:42 +00:00
Baptiste Coudurier
1dec399449 parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files 
Originally committed as revision 12961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:03:28 +00:00
Baptiste Coudurier
69b1c62756 update doc 
Originally committed as revision 12960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:56:08 +00:00
Baptiste Coudurier
7e6273322c error is -1 
Originally committed as revision 12959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:54:33 +00:00
Baptiste Coudurier
cfb5a2abcb cosmetics 
Originally committed as revision 12958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:45:46 +00:00
Baptiste Coudurier
47e1d7efce move vars decls where vars are used 
Originally committed as revision 12957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:44:34 +00:00