virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
20,061 Commits 37 Branches 400 Tags 467 MiB
91d19d471b
Commit Graph

5062 Commits

Author SHA1 Message Date
Ronald S. Bultje
91d19d471b Remove any reference to ASFContext.packet_size and replace it with 
AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use
AVFormatContext->packet_size instead of own copy" thread on ML.

Originally committed as revision 19270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 23:04:05 +00:00
Justin Ruggles
c1c206b343 flvdec: Build a Speex header during FLV demuxing using required and 
default values. This is needed because FLV files with Speex do not
contain a Speex header, which is necessary for stream copy.

Originally committed as revision 19267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 22:10:53 +00:00
Reimar Döffinger
e1c1b0ff09 Reindent after last patch. 
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:40:00 +00:00
Reimar Döffinger
3fe4d5d4e6 mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set. 
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.

Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 09:38:42 +00:00
Reimar Döffinger
5dc5c43bda mov_read_packet: extract code that searches for the stream/sample to demux next 
into a separate function.

Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:57:53 +00:00
Reimar Döffinger
a2f3851166 mov_read_packet: if dv_get_packet fails, return exactly its error value 
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).

Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:50:46 +00:00
Reimar Döffinger
69fc436cbc In mov_read_packet remember the AVStream we want to demux next instead of the 
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.

Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 08:23:40 +00:00
Baptiste Coudurier
6a63ff19b6 check stream existence before assignment, fix #1222 
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-24 03:38:47 +00:00
Peter Holik
7995ed8e69 Add support for "chunked" data blocks. Patch by Peter Holik (peter holik at). 
Originally committed as revision 19256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-23 15:38:53 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +00:00
Ronald S. Bultje
92400be255 Change packet_size from signed to unsigned, since it never has a negative 
value. Currently, this is only used in qcp.c and mpegenc.c, and they are
practically unaffected by this change.

See "[PATCH] make packet_size in AVFormatContext unsigned" thread on ML.

Originally committed as revision 19250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 16:52:02 +00:00
Justin Ruggles
87b4dd3b96 oggenc: Change error log text. An error here does not necessarily mean 
corrupted data.

Originally committed as revision 19248 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-21 20:18:29 +00:00
Justin Ruggles
3f2eadf4fe oggenc: return error value from ogg_build_flac_headers() 
Originally committed as revision 19247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-21 20:16:48 +00:00
Justin Ruggles
4315aa8b05 cosmetics: spacing and comments 
Originally committed as revision 19246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-21 20:14:58 +00:00
Justin Ruggles
e9a32230c3 oggenc: check for failed av_mallocz() 
Originally committed as revision 19245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-21 20:13:54 +00:00
Carl Eugen Hoyos
a481293f13 Revert unintended hunk of r19241. 
Originally committed as revision 19242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 14:51:03 +00:00
Carl Eugen Hoyos
df028e8c6a Revert r19239: It broke four conformance tests. 
Originally committed as revision 19241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 14:47:38 +00:00
Yoshihisa Uchida
3f3f3ba799 Fix onMetaData property count in flv files (issue 1206). 
Patch by Yoshihisa Uchida, yoshihisa D uchida A gmail

Originally committed as revision 19236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 12:52:48 +00:00
Jai Menon
9ed3afcb7f Print meaningful error messages when url_fopen fails. 
Originally committed as revision 19230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 09:00:12 +00:00
Wolfram Gloger
896f2b3212 add 0-termination in table, patch by Wolfram Gloger, wmglo at dent dot med dot uni-muenchen dot de 
Originally committed as revision 19229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-20 06:09:30 +00:00
Brian Brice
8a4ea200e1 fix dvcprohd 720p channels 3 and 4 audio timestamps, patch by Brian Brice, bbrice at gmail dot com 
Originally committed as revision 19228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 21:36:21 +00:00
Patrick Dehne
d52b90bdb4 Add support for id3 tag parsing for ADTS AAC streams 
Patch by Patrick Dehne ( patrick mysonicweb com )

Originally committed as revision 19225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 14:36:47 +00:00
Patrick Dehne
50fcd5be36 Move id3v1/id3v2 handling code from mp3.c to id3v[12].c. 
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 14:03:35 +00:00
Reimar Döffinger
2a04d6e772 Add support for muxing XSUB subtitles to AVI muxer. 
Originally committed as revision 19223 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-19 13:26:10 +00:00
Jason Garrett-Glaser
bc7ea1e5cf Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file. 
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-18 19:31:12 +00:00
Michael Niedermayer
71ee651559 Print why av_find_stream_info() failed, this is a rather common question 
during debugging ...

Originally committed as revision 19217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-18 00:22:08 +00:00
Ronald S. Bultje
f4ca612fbd Set restrictions on packet_size, as per ISO-11172 / H-222 specifications 
(max packet size should fit in 13 bits as a kB value, so 1<<23, plus the
header which is 10 bytes), and as per mpegenc.c internal assumptions
(min packet size is 20 bytes). See "[PATCH] make packet_size in
AVFormatContext unsigned" thread.

Originally committed as revision 19215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-17 19:04:02 +00:00
Benoit Fouet
61ac77f1af Remove a test on an always false condition. 
Originally committed as revision 19214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-17 07:05:17 +00:00
Alexander Strange
0b389aee4d Add '.mp1' for MP1 audio in MOV/CAF. 
Tested with streamcopy of 'mp1-sample.mp1' in incoming.

Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-17 00:37:06 +00:00
Jason Garrett-Glaser
b46f18e5d2 Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file. 
Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-16 23:50:02 +00:00
Art Clarke
e1d8d7bb4b Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about 
skipped metadata packet in FLV demuxer.

Patch by Art Clarke a${surname} At xuggle - com.

Originally committed as revision 19210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-16 23:14:59 +00:00
Patrick Dehne
d9982edfed The AAC demuxer now depends on id3v1.o. 
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-15 08:38:11 +00:00
Baptiste Coudurier
53e099de8b check atom size against edit_count to avoid very long loop 
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-15 02:07:41 +00:00
Baptiste Coudurier
7060667580 fix probing and demuxing of pond.dv, issue #887 
Originally committed as revision 19197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-15 01:41:59 +00:00
Baptiste Coudurier
d509c743b7 check if frame size matches old sys and assumes corrupted input, fixes #1192 
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-14 22:34:28 +00:00
Justin Ruggles
d7bb185f99 Add a VorbisComment metadata conversion table and use it in the FLAC and 
Ogg demuxers.

Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:45:58 +00:00
Aurelien Jacobs
4f909c7675 matroskadec: prepend TargetType to metadata key name 
Originally committed as revision 19184 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:29:38 +00:00
Kostya Shishkov
8c1ff0abae Allocate a bit more memory for MPC SV8 seek table, so bitreader won't read 
beyond allocated block.

Originally committed as revision 19181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 06:39:01 +00:00
Jason Garrett-Glaser
67fe508916 Analysis of logs show that there are in fact some files with m1v1 too (not just m2v2), 
which is documented to be MPEG-1 video.  Adding fourcc to isom.c.

Originally committed as revision 19180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 03:02:16 +00:00
Peter Ross
eacfe8581d Electronic Arts demuxer: support Madcow video tag 
Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 02:20:54 +00:00
David Conrad
86b61d4241 Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of 
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.

Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 00:50:57 +00:00
Jason Garrett-Glaser
761cb87173 Add "0x11005354" as a fourcc for MOV audio; fixes audio detection in a problematic MOV file. 
The audio is actually adpcm_ima_wav.

Originally committed as revision 19176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 00:16:39 +00:00
Alex Converse
70f99f8dd2 Do not include libavcodec/internal.h in the ADTS muxer. 
Originally committed as revision 19173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 19:49:46 +00:00
Jason Garrett-Glaser
fc3fc0293d Add new FOURCC (0x0003) for raw DIB video, set flip flag accordingly. 
Fixes a few AVI files from what is probably a mobile phone video camera.

Originally committed as revision 19172 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 17:39:56 +00:00
Jai Menon
8e6e9bacc4 Associate the 0x6c75 TwoCC used in certain Kodak cameras 
to the PCM Mu-law decoder.
Fixes Issue 1178.

Originally committed as revision 19166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 13:21:01 +00:00
Jimmy Christensen
94d3d6a468 DPX (Digital Picture Exchange) image decoder 
patch by Jimmy Christensen, jimmy ghost dk

Originally committed as revision 19163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 05:29:29 +00:00
David Conrad
34edd9948d Add sac3 to mp4 fourccs for mov+h264+aac-sac3+mp4s+ETERNAL_cut.mp4 
Originally committed as revision 19162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 05:26:40 +00:00
Jason Garrett-Glaser
14ed2d9983 Add "m2v1" to fourccs for MPEG-2 video; fixes some MOV files. 
Originally committed as revision 19161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 02:20:26 +00:00
Jason Garrett-Glaser
be43ae6651 Add alternate fourcc for QCELP audio (qclq). Fixes a problematic MOV file. 
Originally committed as revision 19159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-12 01:09:49 +00:00
Diego Biurrun
1d4b1bf2f6 cosmetics: Prettyprint one more line to have columns line up. 
Originally committed as revision 19158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-11 20:45:35 +00:00