virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity
13,479 Commits 37 Branches 400 Tags 473 MiB
1dec399449
Commit Graph

3258 Commits

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