ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-05 20:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,212 Commits 37 Branches 400 Tags 497 MiB
ce19aec15b
Commit Graph

247 Commits

Author SHA1 Message Date
Michael Niedermayer
c40798441f Merge remote branch 'qatar/master' 
* qatar/master:
  ac3dec: fix processing of delta bit allocation information.
  vc1: fix fate-vc1 after previous commit.
  wmv3dec: fix playback of complex WMV3 files using simple_idct.
  make av_dup_packet() more cautious on allocation failures
  make containers pass palette change in AVPacket
  introduce side information for AVPacket

Politic commits that have not been pulled:
  Update regtest checksums after revision 6001dad.
  Replace more FFmpeg references by Libav.
  Replace references to ffmpeg-devel with libav-devel; fix roundup URL.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-17 23:43:54 +02:00
Diego Biurrun
6001dad6e2 Replace more FFmpeg references by Libav. 2011-04-17 19:31:49 +02:00
Michael Niedermayer
2cae9809e2 Merge remote branch 'qatar/master' 
* qatar/master:
  fate: fix partial run when no samples path is specified
  ARM: NEON fixed-point forward MDCT
  ARM: NEON fixed-point FFT
  lavf: bump minor version and add an APIChanges entry for avio changes
  avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
  avio: make url_fdopen internal.
  avio: make url_open_dyn_packet_buf internal.
  avio: avio_ prefix for url_close_dyn_buf
  avio: avio_ prefix for url_open_dyn_buf
  avio: introduce an AVIOContext.seekable field
  ac3enc: use generic fixed-point mdct
  lavfi: add fade filter
  Change yadif to not use out of picture lines.
  lavc: deprecate AVCodecContext.antialias_algo
  lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
	doc/filters.texi
	libavcodec/ac3enc_fixed.h
	libavcodec/ac3enc_float.h
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-04 02:15:12 +02:00
Anton Khirnov
8978fedaee avio: introduce an AVIOContext.seekable field 
Use it instead of url_is_streamed and AVIOContext.is_streamed.
 2011-04-03 22:46:40 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:15 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Baptiste Coudurier
6dc7dc08ed In mxf muxer, check the return value of gmtime, fix #2494 
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 22:36:23 +00:00
Reimar Döffinger
f8a169ac8e Add extern to mxf_d10_muxer forward declaration to avoid a redundant 
redeclaration warning.

Originally committed as revision 24564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-28 05:48:48 +00:00
Reimar Döffinger
6f2c523c85 Fix a "function declaration isn't a prototype" warning. 
Originally committed as revision 24480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 12:58:28 +00:00
Baptiste Coudurier
29054fdd0a In mxf muxer, fix last b frame temporal offset 
Originally committed as revision 23967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 08:35:47 +00:00
Martin Storsjö
576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header 
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 08:53:40 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Baptiste Coudurier
012dc2c426 Remove MAX_STREAMS usage in ogg and mxf muxers 
Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-29 06:38:00 +00:00
Carl Eugen Hoyos
80454494de Use CODEC_ID_NONE instead of 0 for enum CodecID. 
Originally committed as revision 20481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-08 23:46:32 +00:00
Michael Niedermayer
e07b882b4d Improve amortized worst case speed of the muxers packet interleaving code 
from O(packets_in_the_file) to O(num_of_streams).

Originally committed as revision 19887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 20:04:04 +00:00
Baptiste Coudurier
4eba9cdd07 fix and simplify long gop mpeg codec ul computation 
Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 08:02:01 +00:00
Baptiste Coudurier
df1550f081 set index duration to 0 for cbr, specifying whole container coverage 
Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 07:56:58 +00:00
Baptiste Coudurier
76b092e207 use ber4 length for descriptors preferred by specs 
Originally committed as revision 19337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 07:52:28 +00:00
Baptiste Coudurier
6a43aab01b write profile and level local tag in mpeg descriptor 
Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-04 07:49:12 +00:00
Baptiste Coudurier
b399b932b7 cosmetics, change case and comments alignment 
Originally committed as revision 19305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 07:43:32 +00:00
Baptiste Coudurier
61f9e3c16a correctly compute frame flags with closed gop 
Originally committed as revision 19304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 07:41:40 +00:00
Baptiste Coudurier
c43accabd3 remove useless include 
Originally committed as revision 18906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-23 03:05:56 +00:00
Baptiste Coudurier
df099252bb reindent 
Originally committed as revision 18835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-15 04:44:37 +00:00
Baptiste Coudurier
58a830239d remove unneeded length checks 
Originally committed as revision 18834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-15 04:43:44 +00:00
Baptiste Coudurier
ed6ae6a58b use utc time for timestamp and do not set it if not specified 
Originally committed as revision 17971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 23:39:52 +00:00
Baptiste Coudurier
2261a952f9 do not parse timestamp if bitexact is set, should fix regression tests 
Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 22:43:28 +00:00
Baptiste Coudurier
f344ae8096 again 10l, typo, put_byte instead of put_buffer 
Originally committed as revision 17933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:48:02 +00:00
Baptiste Coudurier
cafdc1876a attempt to try to generate an random umid 
Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 06:15:00 +00:00
Baptiste Coudurier
28c1720023 fix index edit rate, inverse num and den 
Originally committed as revision 17583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 08:09:13 +00:00
Baptiste Coudurier
e38badbc21 simplify, use codec->block_align 
Originally committed as revision 17582 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 08:08:10 +00:00
Baptiste Coudurier
37653f0b93 set channel number even for inactive channels 
Originally committed as revision 17581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 08:06:15 +00:00
Baptiste Coudurier
6df1deda30 do not set frame start bit since marked as not used and factorize 
Originally committed as revision 17580 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 08:05:43 +00:00
Baptiste Coudurier
40284e9c8b start track id at 2, track id 1 for timecode 
Originally committed as revision 17545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-23 19:51:16 +00:00
Baptiste Coudurier
7b05a81687 fix partition index byte count 
Originally committed as revision 17424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 07:14:23 +00:00
Baptiste Coudurier
454d53ed9e always use multi track since timecode track is present 
Originally committed as revision 17423 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 07:13:57 +00:00
Baptiste Coudurier
6739fa54b8 fix preface version 
Originally committed as revision 17421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 04:57:54 +00:00
Baptiste Coudurier
ef33facdfe start counting track number from 0 
Originally committed as revision 17419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 02:57:41 +00:00
Baptiste Coudurier
5bea4f6770 remove redundant comment 
Originally committed as revision 17418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 02:18:52 +00:00
Baptiste Coudurier
c3ff541baa do not write slice count when muxing cbr 
Originally committed as revision 17417 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 02:13:59 +00:00
Baptiste Coudurier
8ab94b524b flush pending write in mxf_write_footer 
Originally committed as revision 17416 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 01:43:40 +00:00
Baptiste Coudurier
659713bf86 use index 0 for timecode track and write it in source package also 
Originally committed as revision 17415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 01:35:36 +00:00
Baptiste Coudurier
6c53bf63c6 fix rip body sid when muxing cbr 
Originally committed as revision 17414 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 01:05:06 +00:00
Baptiste Coudurier
42c6850ed2 simplify descriptor size computation logic 
Originally committed as revision 17410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 00:12:05 +00:00
Baptiste Coudurier
e86a14ded9 fetch display aspect ratio from mpeg-2 essence 
Originally committed as revision 17371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 12:48:45 +00:00
Baptiste Coudurier
d1fa518e9c merge mxf_write_d10_packet into mxf_write_packet 
Originally committed as revision 17367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 10:44:38 +00:00
Baptiste Coudurier
fe5a361c3a fix mxf interleaving packet purge 
Originally committed as revision 17359 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 01:51:52 +00:00
Baptiste Coudurier
73d0869a2f compute body offset and index entry offset correctly 
Originally committed as revision 17219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 22:38:05 +00:00
Baptiste Coudurier
ab91e84d2b fix slice offset computation 
Originally committed as revision 17212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 19:04:30 +00:00
Baptiste Coudurier
1c6bdfa999 set mime type for mxf 
Originally committed as revision 17207 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:57:37 +00:00
Baptiste Coudurier
844d9e4115 simplify 
Originally committed as revision 17206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:46:03 +00:00
Baptiste Coudurier
8d1a5af700 cosmetics, reindent, add/remove some empty lines, redundant comment 
Originally committed as revision 17205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:34:01 +00:00
Baptiste Coudurier
bd3f81f313 MXF D-10 muxer 
Originally committed as revision 17204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:28:20 +00:00
Baptiste Coudurier
6249143da8 store display height without vbi 
Originally committed as revision 17203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:13:36 +00:00
Baptiste Coudurier
db6db7e505 split mpegvideo descriptor into cdci descriptor and wav common in sound common 
Originally committed as revision 17202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:11:21 +00:00
Baptiste Coudurier
e15421fe2b write essence elements klv packets with ber4 length, more interoperable 
Originally committed as revision 17200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 07:06:35 +00:00
Baptiste Coudurier
baaf7b1be1 encode klv fill item length in fixed ber 4 bytes 
Originally committed as revision 17199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 05:33:11 +00:00
Baptiste Coudurier
6f0b186699 set last packet next pointer to null 
Originally committed as revision 17176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 05:32:40 +00:00
Baptiste Coudurier
cfa3caf81c check body partitions count before writing 
Originally committed as revision 17175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 03:38:08 +00:00
Baptiste Coudurier
7a10119057 parse mpeg2 gop header time code and use it 
Originally committed as revision 17149 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 08:02:23 +00:00
Baptiste Coudurier
7c9668cf8a write timecode track 
Originally committed as revision 17148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 07:18:00 +00:00
Baptiste Coudurier
0cfa359660 fix last keyframe index accross body partitions 
Originally committed as revision 17145 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 01:06:12 +00:00
Baptiste Coudurier
1585b93a2c fix body offset 
Originally committed as revision 17144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 00:56:27 +00:00
Baptiste Coudurier
9c91a0b049 fix partition offset when only one stream present 
Originally committed as revision 17140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 23:25:23 +00:00
Baptiste Coudurier
0e633e2b01 fix timecode value 
Originally committed as revision 17139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 22:59:13 +00:00
Baptiste Coudurier
99b170f896 write body partitions 
Originally committed as revision 17126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 09:02:29 +00:00
Baptiste Coudurier
7524f46e21 compute index byte count in mxf_write_partition 
Originally committed as revision 17125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 08:46:04 +00:00
Baptiste Coudurier
c1425a14f1 remove check, mxf muxer does not have track number limitation anymore 
Originally committed as revision 17124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 08:35:14 +00:00
Baptiste Coudurier
4a15f3ee99 retrieve flags from mxf_parse_mpeg2_frame using a param 
Originally committed as revision 17123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 08:31:48 +00:00
Baptiste Coudurier
a784cc679f 10l, edit unit offset is after klv fill 
Originally committed as revision 17122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 07:28:53 +00:00
Baptiste Coudurier
bf31d93ad2 cosmetics, associate mxf_write_klv_fill to aligned elements 
Originally committed as revision 17121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 07:23:51 +00:00
Baptiste Coudurier
ee1f7f4bf9 write component depth and horizontal subsampling best effort local tags 
Originally committed as revision 17120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 06:14:39 +00:00
Baptiste Coudurier
7be3405291 fix header byte count 
Originally committed as revision 17119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 06:09:50 +00:00
Baptiste Coudurier
b25ee3fb38 move up mxf_write_klv_fill and align index, rip and primer pack 
Originally committed as revision 17118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 05:35:28 +00:00
Baptiste Coudurier
bd5c94b546 fix primer pack local tags uls 
Originally committed as revision 17117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 05:22:38 +00:00
Baptiste Coudurier
216b6631fb correctly set multi track operational pattern 
Originally committed as revision 17116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 04:53:41 +00:00
Baptiste Coudurier
16e3b0b3e6 rename ff_audio_interleave to ff_audio_rechunk_interleave 
Originally committed as revision 17103 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 21:34:20 +00:00
Baptiste Coudurier
59453725f2 remove useless return 
Originally committed as revision 17050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:42:37 +00:00
Baptiste Coudurier
425c9962b2 fix doxygen 
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:39:19 +00:00
Baptiste Coudurier
5ac4d7689d reuse MXFCodecUL for data def and simplify 
Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 05:12:30 +00:00
Baptiste Coudurier
251bf87560 remove implicit header inclusions from mxf.h 
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 04:42:38 +00:00
Baptiste Coudurier
84a2d3045b free index entries 
Originally committed as revision 17040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 04:35:36 +00:00
Baptiste Coudurier
f1544e79f2 extract audio interleaving code from mxf muxer, will be used by gxf and dv 
Originally committed as revision 17038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 04:31:44 +00:00
Baptiste Coudurier
d526105f08 only use 2 slices for index, one video(vbr) and one audio(cbr) 
Originally committed as revision 17035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 03:29:49 +00:00
Baptiste Coudurier
5ccc2316ab force first track to be video and simplify 
Originally committed as revision 17034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 02:38:07 +00:00
Baptiste Coudurier
67d8ac4a02 write system item 
Originally committed as revision 17033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 02:34:56 +00:00
Baptiste Coudurier
85d0d114d0 use 512 kag size needed for d10 
Originally committed as revision 17029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-07 02:13:23 +00:00
Baptiste Coudurier
f5b288902e format timestamp correctly according to specs and set it 
Originally committed as revision 17011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 20:15:18 +00:00
Baptiste Coudurier
5ccad11da0 use timestamp as modification date 
Originally committed as revision 17010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 19:30:01 +00:00
Baptiste Coudurier
eacc40e84a use timestamp as creation date 
Originally committed as revision 17007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 18:32:42 +00:00
Baptiste Coudurier
1c7c6669f6 fix key frame offset with open gop 
Originally committed as revision 16999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 07:47:39 +00:00
Baptiste Coudurier
034fcddf3c always write mxf time base in descriptors 
Originally committed as revision 16987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-04 09:35:59 +00:00
Baptiste Coudurier
5a897cfa3c use sample rate as audio input time base 
Originally committed as revision 16985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-04 04:50:47 +00:00
Baptiste Coudurier
832404cea7 exactly compute index byte count 
Originally committed as revision 16981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 23:11:13 +00:00
Baptiste Coudurier
33abc1a73a be more flexible with frame rate check 
Originally committed as revision 16965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 23:37:03 +00:00
Baptiste Coudurier
6fb625c455 cosmetics: whitespaces, empty lines 
Originally committed as revision 16948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:29:31 +00:00