1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

3499 Commits

Author SHA1 Message Date
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
Baptiste Coudurier
8cd92bb915 parser should not be needed anymore, merge cases and set frame size for amr too
Originally committed as revision 12956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:34:51 +00:00
Baptiste Coudurier
3b8c000d1e lower frame size to split amr/qcelp/gsm frames
Originally committed as revision 12954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:24:25 +00:00
Baptiste Coudurier
37ffe34bf3 align and remove useless braces
Originally committed as revision 12952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 12:02:01 +00:00
Baptiste Coudurier
1c126b4f38 cosmetics, remove whitespaces in tags
Originally committed as revision 12951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 11:57:39 +00:00
Baptiste Coudurier
cc326d2bf3 set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
Originally committed as revision 12950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 10:35:06 +00:00
Baptiste Coudurier
07a47ae2a3 pts are unsigned according to specs, fix negative pts when 32bit pts are used
Originally committed as revision 12949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:08:13 +00:00
Baptiste Coudurier
254629b1aa set wrap bits to 32bit to actually use it
Originally committed as revision 12948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:04:38 +00:00
Michael Niedermayer
903a2e8628 Avoid using reserved __names.
Originally committed as revision 12946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 23:21:58 +00:00
Michael Niedermayer
ceedda75ea minor memleak
Originally committed as revision 12945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 23:09:28 +00:00
Michael Niedermayer
81d5ae6dec Fixing memleaks.
Originally committed as revision 12943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 22:16:00 +00:00
Baptiste Coudurier
287d6cfad7 cosmetics: remove useless whitespaces and put braces correctly
Originally committed as revision 12942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:22:39 +00:00
Baptiste Coudurier
3f78a3a955 demux qcelp, so this can work with soc decoder and stream copy
Originally committed as revision 12941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:17:41 +00:00
Baptiste Coudurier
76f34857ce qcelp fourcc
Originally committed as revision 12940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:16:13 +00:00
Baptiste Coudurier
463e7afd18 support for alac in .mov
Originally committed as revision 12938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 13:59:39 +00:00
Baptiste Coudurier
be51192502 set alac frame size from extradata
Originally committed as revision 12937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 13:58:22 +00:00
Michael Niedermayer
5fd63f3c3b Ensure that the timestamp reading code used for seeking chooses a position
which is a multiple of the packet size from the last packet start instead
of the file start. This fixes some seek issues with randomly cut ts files
and the mysterious "4 byte PCR somehing MTS something bug".

Originally committed as revision 12932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-23 21:16:25 +00:00
Rafaël Carré
b4bbcd635f Read asf file header fields in the right order
Patch by Rafaël Carré ( funman videolan org )

Originally committed as revision 12926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 20:08:39 +00:00
Bartlomiej Wolowiec
55736cfbd2 change ff_ac3_parse_header() to take a GetBitContext instead of const char*
Originally committed as revision 12922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 11:14:01 +00:00
Andreas Öman
c675ef7025 Compute AC3 frame CRC for stronger raw AC3 format probing.
Closes issue64.

Originally committed as revision 12920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 15:20:53 +00:00
Henrik Gulbrandsen
4fa6eac5f1 Correct ASF duration.
Patch by Henrik Gulbrandsen: henrik gulbra net

Originally committed as revision 12916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 08:19:16 +00:00
Benjamin Larsson
63d864434d Raw dts muxer
Originally committed as revision 12912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-20 20:28:12 +00:00
Vladimir Voroshilov
159ef4b02a Implement FFMAX3(a,b,c) - maximum over three arguments.
Originally committed as revision 12910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 17:07:58 +00:00
Vladimir Voroshilov
c6cd525aa0 Decrease returning probe score for WAV demuxer to avoid
probe conflict between WAV and future ACT demuxer.
This is necessary because ACT has standard WAV header
at top of it's own.

Originally committed as revision 12909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 14:52:19 +00:00
Mike Melanson
9e2ffc450b Tighten up the Westwood AUD detection. Probability of random detections
used to be on the order of 2^8. It is now on the order of 2^45.

Originally committed as revision 12892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-18 17:29:58 +00:00
Luca Barbato
3adfb3772c doxy header for udp protocol
Originally committed as revision 12861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 16:52:35 +00:00
Diego Biurrun
d965c3e7bc Print duration with higher precision.
patch from Hervé Flores, herve.flores free fr

Originally committed as revision 12847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 06:46:54 +00:00
Luca Barbato
b4999290fd Cleanup comments and make them doxygen parsable.
Originally committed as revision 12841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 22:22:49 +00:00
Luca Barbato
fc9b22dd2e Expose max_packet_size from the rtp protocol
Originally committed as revision 12839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 19:27:39 +00:00
Michael Niedermayer
4b3cca3630 Do not detect a format if another has the same score.
Originally committed as revision 12837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:50:02 +00:00
Michael Niedermayer
056f6b8f09 Using the same probe function in 2 formats is not a good idea.
Originally committed as revision 12836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:48:46 +00:00
Michael Niedermayer
a8f0c9c5b9 Reduce probe score as it misdetects our flv file from the regression test.
The only reason why it does not break them is that flv has the same score
and happens to be first in the list.

Originally committed as revision 12834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:36:31 +00:00
Michael Niedermayer
7344dac4ad Fix probe for mov00003.mqv.
Originally committed as revision 12833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 12:25:03 +00:00
Michael Niedermayer
0c73985444 Identify codec in GMCMidiaASX.mov correctly.
Originally committed as revision 12832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:50:37 +00:00
Luca Abeni
d2bf42bef9 Fix receiving from SDP with unicast destinations
Originally committed as revision 12831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:28:04 +00:00
Luca Abeni
35b74c3deb Remove the "multicast=" tag from UDP and RTP URLs
Originally committed as revision 12830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:23:07 +00:00
Robert Marston
861c63a216 Maxis XA demuxer and decoder.
Patch by Robert Marston rmarston (\at/) gmail point com
Original thread: [FFmpeg-soc] [Patch] Maxis EA XA decoder - GSoC Task
Date: 04/08/2008 01:36 AM

Originally committed as revision 12817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 14:31:43 +00:00
Michael Niedermayer
780169c363 Remove useless code.
Originally committed as revision 12814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:25:44 +00:00
Michael Niedermayer
b41497e903 Recommit r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
After seeking bug has been fixed.

Originally committed as revision 12813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:24:29 +00:00
Michael Niedermayer
0366654e2b Use generic seeking code for flv. The removed code was a buggy duplicate.
Originally committed as revision 12812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:22:23 +00:00
Michael Niedermayer
26d95a1ecf revert r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
As it unexpectly breaks seek regression tests.

Originally committed as revision 12811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:10:53 +00:00
Michael Niedermayer
a33cfa3071 Stop find_stream_info() searching for further streams if 2 streams have
been found.

Originally committed as revision 12810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 23:47:03 +00:00
Michael Niedermayer
749c9201aa 10l
Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
fixes WELCOMETOBELGRADE.flv

Originally committed as revision 12809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 22:58:04 +00:00
Sisir Koppaka
b64c096be9 BFI demuxer
Patch by Sisir Koppaka (sisir.koppaka at G.M!A.I!L.com)

Originally committed as revision 12808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 21:06:31 +00:00
Michael Niedermayer
7ce76ee433 Print warning if scale/rate is invalid.
Originally committed as revision 12806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:45:18 +00:00
Michael Niedermayer
0dbb651564 indent
Originally committed as revision 12805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:41:45 +00:00
Michael Niedermayer
4a030a1fc7 Restructure if/else a little.
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:41:09 +00:00
Reimar Döffinger
ee794d1e49 Do not call update_initial_durations if pkt->duration is 0.
Fixes and assertion crash when playing amv files, e.g.
http://samples.mplayerhq.hu/amv/Shakira - Hips Don't Lie.amv

Originally committed as revision 12797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 08:55:02 +00:00
Michael Niedermayer
fd31550d23 Fix seeking in rm.
Originally committed as revision 12779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 23:19:05 +00:00
Måns Rullgård
71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
Baptiste Coudurier
0265fe81e4 remove cast
Originally committed as revision 12757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-05 12:47:56 +00:00
Baptiste Coudurier
612b5cbb24 better error message
Originally committed as revision 12756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-05 12:46:59 +00:00
Baptiste Coudurier
b64518e91b special mpeg2 handling is no more needed
Originally committed as revision 12685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 09:55:31 +00:00
Luca Barbato
5ee0e1395d use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg
Originally committed as revision 12678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:15:16 +00:00
Aurelien Jacobs
7bfacd4e75 use common aac sample rate tables
Originally committed as revision 12671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 21:41:48 +00:00
Diego Biurrun
b2fec0fc25 Remove unused variable.
Originally committed as revision 12670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 19:03:59 +00:00
Aurelien Jacobs
2d1cb02588 check return value of matroska_find_track_by_num (fix a segfault)
Originally committed as revision 12659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 20:16:04 +00:00
Diego Biurrun
4477dedc4f minor typo fixes
Originally committed as revision 12658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 17:31:11 +00:00
Eli Friedman
4fd51ee39a ARMovie/RPL demuxer
Patch by Eli Friedman (eli friedman gmail com)

Originally committed as revision 12649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 10:44:33 +00:00
Luca Abeni
2ccf0a4290 Add a comment about missing entries
Originally committed as revision 12646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:54:49 +00:00
Luca Abeni
87cb064359 Use the correct size for the enc_name field (removing the arbitrary "50" size)
Originally committed as revision 12645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:49:58 +00:00
Luca Abeni
19faa9f469 Remove useless entries from AVRtpPayloadTypes
Originally committed as revision 12644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:48:04 +00:00
Luca Abeni
e4ed1fbf91 Support mp3 audio in the RTP muxer
Originally committed as revision 12643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:42:45 +00:00
Baptiste Coudurier
b371539a3d prevent writing empty stss atom
Originally committed as revision 12636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 21:18:22 +00:00
Baptiste Coudurier
5e788d588b support mp4 fragmented files without any samples in the moov atom
Originally committed as revision 12635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 21:15:06 +00:00
Baptiste Coudurier
44e43aab03 check frag track id before setting st
Originally committed as revision 12634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 20:49:29 +00:00
Jai Menon
3a027f5e66 IFF demuxer
Patch by Jai Menon (realityman <at> gmx.net)

Originally committed as revision 12633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 19:17:01 +00:00
Justin Ruggles
6e330816d4 fix Ogg/FLAC header size
Originally committed as revision 12626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 03:40:03 +00:00
Baptiste Coudurier
5610f20ed4 gsm in mov, demux surge-1-16-B-agsm.mov
Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 16:30:22 +00:00
Diego Biurrun
c023bfe993 cosmetics: alphabetical order
Originally committed as revision 12619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 10:40:19 +00:00
Michael Niedermayer
1ce50d32b7 indent
Originally committed as revision 12618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 03:50:40 +00:00
Michael Niedermayer
79d6b9cbd0 1000l to myself, dereferencing uninitalized pointer.
Originally committed as revision 12614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 02:44:44 +00:00
Michael Niedermayer
41757171e7 Support wb00+dc00 chunk mix.
fixes issue402

Originally committed as revision 12609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 20:58:01 +00:00
Baptiste Coudurier
9e81a0ce00 print essence path in error message
Originally committed as revision 12607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:30:31 +00:00
Baptiste Coudurier
9ce84dd8b4 cosmetics, useless braces
Originally committed as revision 12606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:20:12 +00:00
Baptiste Coudurier
6282c5f45b print stream index in error message
Originally committed as revision 12605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:19:19 +00:00
Baptiste Coudurier
71f3623510 according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
Originally committed as revision 12604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:16:29 +00:00
Baptiste Coudurier
d3bc61ac75 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.

Originally committed as revision 12603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 12:35:22 +00:00
Michael Niedermayer
61559562f5 Fix aspect ratio.
fixes issue404
avienc.c change by StevieS

Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 01:18:16 +00:00
Michael Niedermayer
57ecf8d281 1st attempt at correcting the punktuation.
Originally committed as revision 12555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 17:25:50 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 01:06:57 +00:00
Michael Niedermayer
4edfceccec Document get_*_buffer()
Originally committed as revision 12548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 22:17:56 +00:00
Baptiste Coudurier
48a5529016 sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
Originally committed as revision 12547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:30:45 +00:00
Sascha Sommer
cb96da4902 rl2 demuxer
Originally committed as revision 12545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:02:13 +00:00
Baptiste Coudurier
084d8faa21 yet again another hdv fourcc
Originally committed as revision 12544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:47:20 +00:00
Baptiste Coudurier
433aeb6240 support fragments when non streamable
Originally committed as revision 12542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:43:19 +00:00
Baptiste Coudurier
61aedb0f56 mp4 fragments support
Originally committed as revision 12541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:40:23 +00:00
Michael Niedermayer
67e2102042 Document a few url_* functions.
Originally committed as revision 12537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:27:07 +00:00
Baptiste Coudurier
117a9190cd cosmetics, split or move too long lines
Originally committed as revision 12536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:16:16 +00:00
Baptiste Coudurier
db3ee6cc96 simplify, and only stop parsing when non streamable
Originally committed as revision 12534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:04:54 +00:00
Baptiste Coudurier
19d02551d7 remove ms audio tags from table, they will be chosen or detected with riff table
Originally committed as revision 12533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:02:13 +00:00
Baptiste Coudurier
bb787a93dd atoms are not mp4 only, and yes probe is sufficient
Originally committed as revision 12532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:52:14 +00:00
Baptiste Coudurier
9c55b7725b update description
Originally committed as revision 12531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:51:12 +00:00
Baptiste Coudurier
3efe8848fc return ENOMEM
Originally committed as revision 12530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:48:22 +00:00
Baptiste Coudurier
2922cbdb14 cannot free AVStream like this, and return ENOMEM
Originally committed as revision 12529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:47:14 +00:00
Baptiste Coudurier
e3c4740fd4 indentation
Originally committed as revision 12528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:39:49 +00:00
Baptiste Coudurier
721da10aeb fix mpeg2 muxing, replace seq header if contained in extradata and key frame does not contain it
Originally committed as revision 12520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:48:50 +00:00
Baptiste Coudurier
7b0f4c9aaa cosmetics, move case up
Originally committed as revision 12519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:42:44 +00:00
Michael Niedermayer
b7c407449b One non functional AVPalette chunk less, one heap overflow less.
Fixes playback of CIMOVI01.avi.

Originally committed as revision 12517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:29:18 +00:00
Baptiste Coudurier
eb61405a07 remove useless debug print since now mov_build_index will do
Originally committed as revision 12516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:07:55 +00:00
Baptiste Coudurier
f9900374ec free track data asap
Originally committed as revision 12515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:00:45 +00:00
Baptiste Coudurier
1e77810d3b move mov_build_index before mov_read_trak to avoid useless declaration
Originally committed as revision 12514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:57:11 +00:00
Baptiste Coudurier
bd991df2a7 move specific end treatment when trak is detected, will be needed for fragments
Originally committed as revision 12513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:55:50 +00:00
Pascal Massimino
c04c52d3a8 Additional checks for strange num_val in FLV metadata
Avoids some "Unsupported audio codec (6)" message in FLVs, e.g.
        Example of such problematic bitstream is 'bad_codec6.flv'
        in ftp's /incoming directory.

Originally committed as revision 12510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 11:02:40 +00:00
Ronald S. Bultje
7e6ca34f27 Reindent after rtsp-alternate-protocol* patches.
Originally committed as revision 12506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:08:16 +00:00