virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
23,312 Commits 37 Branches 400 Tags 464 MiB
db76ca7f35
Commit Graph

290 Commits

Author SHA1 Message Date
Baptiste Coudurier
a2523ce2e2 fix subs track height, set track->height to codec height if not set 
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:04:56 +00:00
Ronald S. Bultje
2d243fb3fc Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used 
in mov.c for the demuxer. See "[PATCH] rename movenc.c MOVContext to
MOVMuxContext" thread on the mailinglist.

Originally committed as revision 17659 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-28 16:02:29 +00:00
Aurelien Jacobs
d9fc9ff31b movenc: add muxing of language along with metadata tags when available 
Originally committed as revision 17612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:13:48 +00:00
Aurelien Jacobs
2904fd398f return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking 
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:11:18 +00:00
Aurelien Jacobs
b97fb809b8 cosmetics: indentation 
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:08:22 +00:00
Aurelien Jacobs
1ee2d44805 use new metadata API in mov muxer 
Originally committed as revision 17609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:06:49 +00:00
Michael Niedermayer
2591821213 Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames. 
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 15:04:18 +00:00
Baptiste Coudurier
6a460c36b6 write active picture height for d-10/imx in mov 
Originally committed as revision 17178 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 09:15:36 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Baptiste Coudurier
5d2160a0dd move actual writing before so new size can be taken into account 
Originally committed as revision 16623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 01:12:32 +00:00
Luca Abeni
ca93bc175a Reindent after last commit 
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 14:07:59 +00:00
Luca Abeni
0a63a676ec Do not reallocate AVPacket's data when muxing a packet 
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 14:03:07 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Baptiste Coudurier
87609b51da cosmetics 
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:42:24 +00:00
Baptiste Coudurier
985688b8e5 remove warnings about uninitialized vars 
Originally committed as revision 16534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:41:43 +00:00
Baptiste Coudurier
3d1b0fcd59 cosmetics 
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:36:19 +00:00
David Conrad
f620488654 Add support for muxing mov/mp4/3gp timed text streams 
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:26:44 +00:00
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility 
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:06:56 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Baptiste Coudurier
bed4fc54c9 write copyright metadata tag 
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 19:11:53 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Baptiste Coudurier
1993f8d640 terminate tag tables by CODEC_ID_NONE 
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 00:58:24 +00:00
Baptiste Coudurier
cf74dd4a5c do not fail if audio is uncompressed and frame size is not set, just set it 
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 02:30:27 +00:00
Baptiste Coudurier
efa1fb39d2 cosmetics, remove whitespace 
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:26:31 +00:00
Kurtnoise
4ed1942008 actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr 
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:25:55 +00:00
Damiano Galassi
544a0f47af skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits, 
patch by Damiano Galassi, damiog at gmail dot com

Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:17:21 +00:00
Baptiste Coudurier
c4e02d702c change the logic to mux 13818-3 and 11172-3 in mp4, less code 
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:42:09 +00:00
Baptiste Coudurier
e00c3de821 forbid mp3 < 16000hz in anything except mov 
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:31:03 +00:00
Baptiste Coudurier
c3b1325158 dirac muxing support in mp4/mov 
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:23:24 +00:00
Baptiste Coudurier
baa0be4cf0 cosmetics, vertical align 
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:08:56 +00:00
Baptiste Coudurier
d4a240cbc9 ac3 muxing support in mov/mp4/m4v 
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:05:22 +00:00
Baptiste Coudurier
dfce888f8a correctly mux mpeg2 audio 13818-3 in mp4 
Originally committed as revision 15156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 20:48:45 +00:00
Baptiste Coudurier
e8c4df40e3 check for malloc failure 
Originally committed as revision 15132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:21:00 +00:00
Baptiste Coudurier
db568c079a copy whole frame in vosData for dnxhd, this code will be used for other codecs too 
Originally committed as revision 15131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:20:12 +00:00
Reimar Döffinger
c18545929e Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const * 
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 16:51:50 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +00:00
Baptiste Coudurier
bc4c3a55f5 clarify error message about codec tag 
Originally committed as revision 14013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-27 21:29:11 +00:00
Baptiste Coudurier
40f8675ccf set correct ftyp minor version for 3gp/2 
Originally committed as revision 13774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-15 01:38:38 +00:00
Baptiste Coudurier
6ba9ed9557 invert mode_mov condition 
Originally committed as revision 13773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:12:51 +00:00
Baptiste Coudurier
d3e4783212 simplify 
Originally committed as revision 13772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:11:16 +00:00
Baptiste Coudurier
3473ca9a25 change 3gp/3g2 brands if h264 is present 
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:10:11 +00:00
Baptiste Coudurier
cd70d17f5f simplify ipod brand selection 
Originally committed as revision 13770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:07:59 +00:00
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
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
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
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
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
Baptiste Coudurier
287d6cfad7 cosmetics: remove useless whitespaces and put braces correctly 
Originally committed as revision 12942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 17:22:39 +00:00
Baptiste Coudurier
463e7afd18 support for alac in .mov 
Originally committed as revision 12938 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 13:59:39 +00:00
Baptiste Coudurier
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
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
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
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
Baptiste Coudurier
91208916c6 cosmetics, remove whitespaces before and after parenthesis 
Originally committed as revision 11879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-06 18:57:00 +00:00
Michael Niedermayer
f70eccdb39 2 more missing consts found by -Wwrite-strings. 
Originally committed as revision 11849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 01:06:04 +00:00
Baptiste Coudurier
fa7343eaf2 stupid typo 
Originally committed as revision 11693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-31 13:40:53 +00:00
Baptiste Coudurier
ccac843872 support rawvideo in mov 
Originally committed as revision 11691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-31 11:31:56 +00:00
Baptiste Coudurier
4ad08accb2 use context in av_log 
Originally committed as revision 11668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-30 13:22:31 +00:00
Baptiste Coudurier
c8134d7104 warning is only valid for mov 
Originally committed as revision 11667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-30 13:22:04 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if 
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align 
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict 
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell 
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation 
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp 
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used 
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 13:44:27 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field 
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-28 13:19:16 +00:00
Aurelien Jacobs
9ab3f71b60 add a ff_ prefix to newly exported functions from avc.c 
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 23:33:32 +00:00
Aurelien Jacobs
1bd2d763d4 Move isom_write_avcc() and related functions into a separate file. 
Originally committed as revision 11498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 01:24:55 +00:00
Aurelien Jacobs
6e6eebf919 extract isom_write_avcc into a function 
Originally committed as revision 11497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 01:04:01 +00:00
Aurelien Jacobs
de04ad45ec Add one more parameter to avc_parse_nal_units so that it allows not to 
free the input buffer.
This is required by upcoming extraction of isom_write_avcc to a function.

Originally committed as revision 11496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 01:00:04 +00:00
Aurelien Jacobs
ed7fa39c2d Check return value of avc_parse_nal_units(). 
Originally committed as revision 11495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 00:47:02 +00:00
Baptiste Coudurier
b356f75d46 fix indentation 
Originally committed as revision 11282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-20 09:51:11 +00:00
Baptiste Coudurier
79e42311d3 use generic 'glbl' atom if extradata is present but no specific method is known 
Originally committed as revision 11272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-19 16:00:08 +00:00