virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
15,064 Commits 37 Branches 400 Tags 460 MiB
6b477e1b71
Commit Graph

3618 Commits

Author SHA1 Message Date
Baptiste Coudurier
7b0fb8b77a fix warning, write_ftyp return int now 
Originally committed as revision 13769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:06:10 +00:00
Baptiste Coudurier
835790846c put avc1 brand in compat list when h264 is present 
Originally committed as revision 13768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:05:28 +00:00
Michael Niedermayer
65f526835f I think we are also compliant to iso2. 
Originally committed as revision 13765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 13:52:53 +00:00
Michael Niedermayer
ed6e47c21d Add isom to the compatible brands. 
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 12:19:01 +00:00
Michael Niedermayer
1560b66714 Calculate ftyp size instead of hardcoding it. 
Originally committed as revision 13763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 11:30:36 +00:00
Michael Niedermayer
a04aec6d1a simplify MODE_3G2 
Originally committed as revision 13755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 03:08:41 +00:00
Michael Niedermayer
2c77994fc8 Change MODE_* to 1<<c so several can be set at the same time. 
Originally committed as revision 13754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 03:08:08 +00:00
Baptiste Coudurier
ce072b2d30 cosmetics, reindent 
Originally committed as revision 13752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 00:56:54 +00:00
Baptiste Coudurier
283c9a8ed4 don't write double sets of metadata in mov, only write usual ones 
Originally committed as revision 13751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 00:55:49 +00:00
Joakim Plate
de6a9a2673 matroskadec: set cur_dts after seek 
patch by elupus   elupus _at_ ecce _dot_ se

Originally committed as revision 13748 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 19:54:17 +00:00
Baptiste Coudurier
927509e10b indent 
Originally committed as revision 13747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:40:40 +00:00
Baptiste Coudurier
c6e2c6c9c6 support for 3gp metadata 
Originally committed as revision 13746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:40:22 +00:00
Baptiste Coudurier
07b7b06d92 move utf8 code before udta func, will be used by 3gp tags 
Originally committed as revision 13745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:35:02 +00:00
Baptiste Coudurier
c55cc074cc write usual brand for ipod format 
Originally committed as revision 13744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:33:35 +00:00
Baptiste Coudurier
d32d6defee simplify 
Originally committed as revision 13743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:06:27 +00:00
Baptiste Coudurier
20e22af85a factorize psp metadata 
Originally committed as revision 13742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 09:02:01 +00:00
Baptiste Coudurier
f7635edb4d cosmetics 
Originally committed as revision 13741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 08:50:41 +00:00
Baptiste Coudurier
c3858df291 cosmetics 
Originally committed as revision 13740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 08:39:35 +00:00
Baptiste Coudurier
709c9f8de3 support alac in ipod m4a format, tested on quicktime 
Originally committed as revision 13739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-11 08:17:38 +00:00
Baptiste Coudurier
ccec1b69c0 m4v/m4a are usual itunes/ipod/iphone extensions 
Originally committed as revision 13737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 22:14:58 +00:00
Baptiste Coudurier
d88812a91f indent 
Originally committed as revision 13736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 20:14:09 +00:00
Baptiste Coudurier
d1d87dfba0 rework udta handling, if any track set bitexact, don't write any metadata 
Originally committed as revision 13735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 20:13:44 +00:00
Baptiste Coudurier
1dc7ff331a 10l, add parentheses 
Originally committed as revision 13734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-09 19:58:35 +00:00
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
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