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
13,376 Commits 37 Branches 400 Tags 498 MiB
a1b914b20d
Commit Graph

3228 Commits

Author SHA1 Message Date
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
Ronald S. Bultje
8792f52a9b Change protocol_mask into protocol, since we always just try a single one per 
iteration in make_setup_request(), and cycling between the different protocols
is now done in the calling function, therefore the need for a mask goes away.
This also makes the function somewhat simpler to read.

Discussed and approved in "[PATCH] RTSP alternate protocol 3/4".

Originally committed as revision 12505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 14:07:31 +00:00
Ronald S. Bultje
8a8754d80f Allow cycling between different protocols (TCP, UDP or multicast) so that if 
one doesn't work, we can try the next one (i.e. trial-error protocol auto-
probing).

Discussed and approved in "[PATCH] RTSP alternate protocol 2-3/3".

Originally committed as revision 12504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 14:05:08 +00:00
Ramiro Polla
0f3444e17c MSN TCP Webcam stream demuxer. 
Originally committed as revision 12492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 19:54:47 +00:00
Ronald S. Bultje
53620bba51 Split the SETUP request into a separate function, as a prelude into allowing 
multiple SETUPs to be send to cycle protocols rather than bailing if one
fails.

Discussed and approved in "[PATCH] RTSP alternate protocol 1/3".

Originally committed as revision 12476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-17 12:16:39 +00:00
Baptiste Coudurier
8c2a207019 just skip klv packet, when no corresponding stream is found 
Originally committed as revision 12464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 17:54:36 +00:00
Baptiste Coudurier
23f0861715 simplify, flags is 24bits according to specs 
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 15:13:40 +00:00
Baptiste Coudurier
558ce5c490 fucked up alphabetical order again, sorry 
Originally committed as revision 12459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 13:40:21 +00:00
Baptiste Coudurier
aa9f4208b6 ipod/iphone compatible mp4 muxer 
Originally committed as revision 12458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-16 13:36:36 +00:00
Diego Biurrun
bd10713636 typo fixes 
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-15 16:15:47 +00:00
Baptiste Coudurier
4e9b8211b0 useless null 
Originally committed as revision 12441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 13:10:49 +00:00
Baptiste Coudurier
82213f68ba remove useless img_write_trailer func 
Originally committed as revision 12440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-14 12:48:13 +00:00
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Aurelien Jacobs
074ac3c2d0 add out of bound stream index checks 
fix issue379

Originally committed as revision 12417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 21:23:06 +00:00
Aurelien Jacobs
6ed4eec550 add a temporary variable to simplify the code 
Originally committed as revision 12415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 21:09:27 +00:00
Björn Axelsson
5acef35f57 Add AVClass to URLContext at next major version bump 
Patch by Björn Axelsson (bjorn axelsson intinor se)

Originally committed as revision 12411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 19:03:39 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes 
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:42:09 +00:00
Aurelien Jacobs
b847847a0c cosmetics: remove some empty lines 
Originally committed as revision 12404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:48:36 +00:00
Aurelien Jacobs
01ccf45b92 remove useless and misleading comments 
Originally committed as revision 12403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:45:25 +00:00
Aurelien Jacobs
36b0782e71 consistent use of MKTAG() in the codec_bmp_tags table 
Originally committed as revision 12401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:43:55 +00:00
Aurelien Jacobs
ab0b2e559a cosmetics: alignment of the codec_bmp_tags table 
Originally committed as revision 12400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:34:14 +00:00
Mike Melanson
d98878f423 recognize the CLJR FourCC (Cirrus Logic AccuPak) 
Originally committed as revision 12391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 04:18:48 +00:00
Ramiro Polla
ffa71b2bbb Typo + grammar 
Originally committed as revision 12385 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 22:43:13 +00:00
Ramiro Polla
ab8ab30c3d Introduce max_picture_buffer variable in AVFormatContext, 
set by rtbufsize option.

Originally committed as revision 12383 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 21:59:11 +00:00
Ramiro Polla
54b6249681 Define WIN32_LEAN_AND_MEAN before including windows.h to exclude 
rarely-used header files.

Originally committed as revision 12378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 19:00:55 +00:00
Ramiro Polla
a06ba2a18d Include windows.h instead of trying to redeclare Sleep 
os_support.h used to be included in all lavf files, and including windows.h
here caused a significant slowdown.

Originally committed as revision 12377 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 18:59:45 +00:00
Ramiro Polla
409e1d71ea Put network-related code under #ifdef 
Originally committed as revision 12372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 17:43:53 +00:00
Ramiro Polla
591cf1170b Group network-related code together 
Originally committed as revision 12371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 17:43:10 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile. 
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-08 14:39:43 +00:00
Ramiro Polla
5dea940937 __stdcall -> WINAPI 
Windows x64 has no __stdcall.
It is not yet supported, but someday it might...

Originally committed as revision 12363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:47:44 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling 
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:27:17 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing 
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-07 19:25:09 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment 
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 20:44:44 +00:00
Baptiste Coudurier
4c7981ba7c do not reset duration_error for all streams, only reset current stream, fix wrong_fps.gxf 
Originally committed as revision 12353 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 17:44:42 +00:00
Baptiste Coudurier
72d334cab4 support AVDISCARD_ALL 
Originally committed as revision 12350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 13:40:29 +00:00
Michael Niedermayer
11c55efa34 Skip over unknown extended_content_header tags. 
fixes issue358

Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 00:26:48 +00:00
Michael Niedermayer
16428e6348 simplify 
Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 00:20:49 +00:00
Diego Biurrun
d78d72da66 Set TCP protocol to is_streamed=1 as seeking is not possible. 
Björn Axelsson, bjorn.axelsson intinor se

Originally committed as revision 12338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 15:29:10 +00:00
Luca Abeni
83cc23c5d3 Add some information about the stream bitrate, if available 
Originally committed as revision 12331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 13:31:24 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested) 
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 13:06:49 +00:00
Baptiste Coudurier
112249de00 set block align for mace3/6 
Originally committed as revision 12328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 12:06:57 +00:00
Baptiste Coudurier
28da7981d0 correctly compute bit rate for compressed audio, should fix seeking in aiff 
Originally committed as revision 12327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-05 12:02:32 +00:00
Michael Niedermayer
675b8390f6 Ignore flags after pts/dts if there are no bytes left. 
Fixes decoding of vdr-radio.vdr. (issue198)

Originally committed as revision 12310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-04 01:31:15 +00:00
Aurelien Jacobs
6e196eacc3 include required headers for int64_t and AV_RB16() 
Originally committed as revision 12306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 23:00:48 +00:00
Aurelien Jacobs
abf2dc9c9a avi.h does not use anything from avcodec.h. 
Originally committed as revision 12305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 22:56:07 +00:00
Reimar Döffinger
e7a5e2f626 Fix decoding of interlaced gif, e.g. http://samples.mplayerhq.hu/GIF/7up.gif 
Originally committed as revision 12297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 13:16:29 +00:00
Michael Niedermayer
78db672cae Use block_align as the avi spec says. 
fix issue274

Originally committed as revision 12296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 01:27:15 +00:00
Michael Niedermayer
143b082044 Print slightly more useful info. 
Originally committed as revision 12295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-03 01:23:18 +00:00
Michael Niedermayer
a7805e2983 Fallback to sample rate if bit rate is 0. This avoids 0 timebases in nut. 
Originally committed as revision 12294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:47:30 +00:00
Michael Niedermayer
9fdfd21c77 factorize 
Originally committed as revision 12293 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:13:07 +00:00
Michael Niedermayer
a048febdc4 subtitles (codec tag tables still missing ...) 
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:11:36 +00:00
Michael Niedermayer
5b08754912 Store aspect ratio in avis. 
Originally committed as revision 12290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 19:51:31 +00:00
Mike Melanson
74e21d0352 fix wc3movie demuxer to conform to the PTS API 
Originally committed as revision 12283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-01 02:28:47 +00:00
Mike Melanson
40e8e49700 fix the id CIN demuxer by using the pts API correctly 
Originally committed as revision 12281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-01 01:43:19 +00:00
Aurelien Jacobs
73260a11e1 simplification proposed by Rich 
Originally committed as revision 12280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-01 00:26:19 +00:00
Michael Niedermayer
2401daaf39 add cdvc 
(from a patch by Dmitry Vassiliev // slydiman mail ru)

Originally committed as revision 12279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-29 11:41:57 +00:00
Baptiste Coudurier
0de2157fa4 set codec bps to grayscale bits, fix 256grey.mov 
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-28 16:05:19 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing. 
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 20:34:44 +00:00
Baptiste Coudurier
da00a1bdf4 add weird first atom to probe, finally fix bartjones.mov 
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779 free in case of multiple type == 2 
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525 return error if malloc fails 
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e fix possible overflow with memmove 
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 09:30:05 +00:00
Aurelien Jacobs
0b247953c8 makes really sure that no undefined behavior can happen 
Originally committed as revision 12258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 00:53:34 +00:00
Aurelien Jacobs
d597655f77 Avoid infinite loop. 
uint64_t >> 64 is an undefined operation

Originally committed as revision 12253 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 22:35:07 +00:00
Måns Rullgård
800c289a66 less preprocessor magic in version number macros 
Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 20:37:59 +00:00
Baptiste Coudurier
26846ba515 support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking 
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov 
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 18:21:58 +00:00
Baptiste Coudurier
60f5c96ee6 remove useless braces 
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation 
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2 
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos 
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 14:31:36 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation 
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 10:21:33 +00:00