ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-08 10:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,485 Commits 37 Branches 400 Tags 498 MiB
ae32e509fb
Commit Graph

3495 Commits

Author SHA1 Message Date
Baptiste Coudurier
cabc1a7dce indent 
Originally committed as revision 13733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 19:56:59 +00:00
Baptiste Coudurier
b63ba850c1 remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme still fits 
Originally committed as revision 13732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 19:56:45 +00:00
Baptiste Coudurier
0724373d2c cosmetics 
Originally committed as revision 13731 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 18:23:06 +00:00
Michael Niedermayer
45b2b05f8e Make timestamp debugging work nicer. 
Originally committed as revision 13728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 13:38:56 +00:00
Albert Astals Cid
e785efc49a Fix compilation with -DDEBUG, patch by Albert Astals Cid, aastals tv-wan es. 
Originally committed as revision 13727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 08:44:45 +00:00
Baptiste Coudurier
83657f9f1c remove now unneeded vars 
Originally committed as revision 13726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 07:43:59 +00:00
Baptiste Coudurier
3c6a9f66b9 pass dts and pts through ffm, should fix streaming b frames 
Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 07:43:14 +00:00
Baptiste Coudurier
7080cbe2c8 pass extradata through ffm 
Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 00:36:27 +00:00
Baptiste Coudurier
3438d82d4b remove ugly ffm_nopts hack, use AVFormatContext->timestamp 
Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 00:24:29 +00:00
Benjamin Larsson
b339f0c6be Oma demuxer 
Originally committed as revision 13712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-08 17:12:25 +00:00
Baptiste Coudurier
2940b38ef2 fix pts handling in ffm 
Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 00:49:03 +00:00
Baptiste Coudurier
c07d64c890 Reset reading state after successful seek. 
Originally committed as revision 13682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-07 00:35:37 +00:00
Ramiro Polla
15d856e8d2 Remove wrappers of pcm_read_seek(). 
Last commit missed one file.

Originally committed as revision 13681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 21:54:07 +00:00
Ramiro Polla
5256e42c0b Remove wrappers of pcm_read_seek(). 
Originally committed as revision 13680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 21:53:03 +00:00
Baptiste Coudurier
b30bb5357d cosmetics, rename first to header, more explicit name 
Originally committed as revision 13677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 20:36:16 +00:00
Baptiste Coudurier
a1011180d5 cosmetics, rename first to header, more explicit name 
Originally committed as revision 13676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 20:14:47 +00:00
Diego Biurrun
969f949300 Remove Fabrice's copyright from the Makefiles. They have been entirely 
rewritten since they were originally created.

Originally committed as revision 13675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 17:50:32 +00:00
Ramiro Polla
bea91b8c29 Remove useless img_read_close(). 
Originally committed as revision 13674 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 17:02:06 +00:00
Ramiro Polla
2377922192 Remove unneeded NULL at end of struct. 
Originally committed as revision 13673 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 17:00:28 +00:00
Ramiro Polla
fc9c2d53c3 Merge declaration and initialization. 
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 16:53:01 +00:00
Stefano Sabatini
ffa5ed2464 cosmetics: s/Id/id/ in libavformat where Id refers to id Software. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-05 15:03:55 +00:00
Aurelien Jacobs
03b9d94e86 matroskadec: remove some useless code 
Originally committed as revision 13659 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-04 23:24:55 +00:00
Aurelien Jacobs
e9b56825be cosmetics: indentation 
Originally committed as revision 13658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-04 23:15:08 +00:00
Aurelien Jacobs
fc4738ae96 matroskadec: don't remove dummy level when none was added 
Originally committed as revision 13657 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-04 23:11:47 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Aurelien Jacobs
ca162a5004 Ensure the first audio stream is selected as the default stream 
when no video stream is present.

Originally committed as revision 13648 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 15:19:43 +00:00
Aurelien Jacobs
401cdd519c adjust comment to reality 
Originally committed as revision 13647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 15:14:21 +00:00
Aurelien Jacobs
94f6c011d6 matroskadec: sane default value for track->time_scale 
Originally committed as revision 13646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 15:09:30 +00:00
Baptiste Coudurier
d3ad044ad5 add pretty common .m2t as ts extension 
Originally committed as revision 13642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:55:05 +00:00
Baptiste Coudurier
3654a16dc9 fix continuity counter to start at 0 
Originally committed as revision 13641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:53:33 +00:00
Michael Niedermayer
820ad60cd9 Make update_initial_durations() also work if a dts occured before a 
sequence header (that is a few known dts/pts but no known durations
previously)
cnnts1.mpg is one sample affected by this.

Originally committed as revision 13640 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:50:22 +00:00
Michael Niedermayer
5853423c3f Do not set pts in update_initial_durations() if stream has b frames. 
Originally committed as revision 13639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 00:43:56 +00:00
Aurelien Jacobs
ff2c222c37 matroskadec: fix potential mem leak 
may or may not fix CID134 and CID135

Originally committed as revision 13636 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 23:37:14 +00:00
Aurelien Jacobs
34ae40971b matroskadec: avoid potential mem leak 
fix CID120

Originally committed as revision 13635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 23:27:14 +00:00
Aurelien Jacobs
fe53fa253f reorganize matroska_add_stream() to fix potential mem leak and buffer overflow 
fix CID44

Originally committed as revision 13634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 23:07:41 +00:00
Aurelien Jacobs
4b3dc529f5 matroskadec: move ARRAY_SIZE() macro at top of the file 
Originally committed as revision 13633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 23:01:14 +00:00
Andreas Öman
1686cce6e6 Audio channels and sample rate must be set in order to skip 
additional probing of a stream.

Originally committed as revision 13619 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 09:15:04 +00:00
Baptiste Coudurier
c5577c403f rename last_frame_offset to next_frame_offset, due to r13615 
Originally committed as revision 13618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-02 04:08:30 +00:00
Panagiotis Issaris
437fd77b05 Check whether the memory allocation for extradata succeeded. Fixes issue 472. 
Originally committed as revision 13603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-01 16:25:05 +00:00
Aurelien Jacobs
934b910ba0 matroskadec: use the proper timestamp scaling for index entries 
Originally committed as revision 13602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-01 14:41:53 +00:00
Anton Khirnov
7ff9708585 matroskadec: read TrackTimecodeScale and set timebase accordingly 
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13601 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-01 13:54:11 +00:00
Anton Khirnov
cdae8eec10 matroskadec: silently discard some element ID that we don't care about 
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-01 13:39:54 +00:00
Peter Ross
750066ea1c flvenc.o depends on avc.o (for H.264 support functions). 
patch by Peter Ross, pross xvid org

Originally committed as revision 13574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-31 14:26:56 +00:00
Ramiro Polla
16e861e3ee raw mlp demuxer 
Based on patch by Jeff Muizelaar <jrmuizel <at> gmail.org>
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/57797

Originally committed as revision 13558 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 16:05:56 +00:00
Quoc Cuong Pham
dd0f776c98 Detect "tif" suffix as TIFF. 
Patch by Quoc Cuong Pham: Quoc-Cuong D PHAM AT cea D fr

Originally committed as revision 13557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-30 13:26:40 +00:00
Reimar Döffinger
e8bd16a5e1 Check av_new_stream return value, fixes CID75 RUN2 
Originally committed as revision 13536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:59:14 +00:00
Michael Niedermayer
8b9c4ad237 ENOMEM is better, yes ... 
Originally committed as revision 13535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:40:16 +00:00
Reimar Döffinger
60583fb653 Check av_new_stream return value, fixes CID79 RUN2 
Originally committed as revision 13534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:25:45 +00:00
Reimar Döffinger
6c10281c3a Check for av_new_stream failure, fixes CID76 RUN2 
Originally committed as revision 13533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 15:22:45 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes. 
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 13:40:43 +00:00
Joakim Plate
5faf168940 Check return of url_fseek in mpeg timestamp reading code. 
Patch by Joakim elupus ecce se

Originally committed as revision 13527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 09:50:17 +00:00
Baptiste Coudurier
96f69e0d87 warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy 
Originally committed as revision 13519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 00:58:41 +00:00
Baptiste Coudurier
c4f078ffe1 reindent 
Originally committed as revision 13518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 00:54:33 +00:00
Baptiste Coudurier
e95580e70a this should be valid for audio too 
Originally committed as revision 13517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 00:54:09 +00:00
Baptiste Coudurier
c2acba13a4 check if extradata comes from mp4 and assume bitsteam is already formated, should fix streamcopy 
Originally committed as revision 13516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 00:35:23 +00:00
Michael Niedermayer
5a96cd64de memleak / CID124 RUN2 
Originally committed as revision 13512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 22:26:35 +00:00
Baptiste Coudurier
57783b07a0 use av_fifo_generic_write, old func is deprecated 
Originally committed as revision 13511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 22:00:45 +00:00
Michael Niedermayer
9bf8b5621a Dead code removal, fixes CID59 RUN2. 
Originally committed as revision 13509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 21:22:08 +00:00
Michael Niedermayer
e88b67de6c Removing dead code, fixes CID4 RUN2. 
Originally committed as revision 13507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 21:14:10 +00:00
Michael Niedermayer
ea813b44a8 remove != 0 
Originally committed as revision 13503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 20:33:22 +00:00
Michael Niedermayer
591944cd0c Do a little more checking. 
Originally committed as revision 13502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 20:30:42 +00:00
Michael Niedermayer
e1dd8ac744 Do not read from after the table, fixes CID108 RUN2. 
Originally committed as revision 13501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 20:28:48 +00:00
Michael Niedermayer
884d53855d Null pointer check / CID26. 
Originally committed as revision 13488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:57:19 +00:00
Michael Niedermayer
7a7718e38f useless 
Originally committed as revision 13486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 01:53:23 +00:00
Michael Niedermayer
fce88d52ca Fixes NULL pointer dereference CID66 
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:10:34 +00:00
Michael Niedermayer
9d4cd3bfd5 Tell the user if a AVI is non interleaved. 
Originally committed as revision 13482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 00:07:41 +00:00
Baptiste Coudurier
efb533312f use internal video frame number 
Originally committed as revision 13479 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:37:54 +00:00
Baptiste Coudurier
f2ecb775a7 cosmetics 
Originally committed as revision 13478 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:34:31 +00:00
Baptiste Coudurier
003ae66086 simplify, use pointer to codec context in struct instead of only id 
Originally committed as revision 13477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:31:26 +00:00
Baptiste Coudurier
92f76fbf23 simplify, use pointer to codec context in struct instead of only id 
Originally committed as revision 13476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 22:31:09 +00:00
Michael Niedermayer
5e5c908691 redundant check-- 
Originally committed as revision 13474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 21:44:42 +00:00
Michael Niedermayer
c2a3dcaf25 Fix memleak, fixed CID123. 
Originally committed as revision 13472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 20:48:27 +00:00
Michael Niedermayer
406a0fdcab Do not use the pts/dts calculation code which needs a parser, when no parser 
is available.

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

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