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
21,618 Commits 37 Branches 400 Tags 464 MiB
4da715cb24
Commit Graph

5416 Commits

Author SHA1 Message Date
tralph11@yahoo.com
711e69a730 Improve sofdec dectection to avoid false positives for MP2. 
Patch by tralph11, tralph11 yahoo

Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 15:27:05 +00:00
Benoit Fouet
08580cb05a Make url_resetbuf() assert on wrong flags passed and make it static on next 
version bump.
See thread: [FFmpeg-devel] & vs. &&
Date: Mon, 12 Oct 2009 14:21:06 +0200

Originally committed as revision 20330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-20 06:40:01 +00:00
Diego Biurrun
0cd0a22488 Move function that is only used by the MP3 muxer below the corresponding #if. 
This removes the dependency of the MP2 muxer on the id3v2 object file.

Originally committed as revision 20329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 23:22:23 +00:00
Diego Biurrun
ff06d76acd Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32. 
This fixes the build with demuxers disabled.

Originally committed as revision 20327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:36:57 +00:00
Diego Biurrun
cd69fa69c5 The MP2/MP3 muxer uses ff_id3v2_tags, so add the correct object dependency. 
Originally committed as revision 20326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:32:32 +00:00
Diego Biurrun
6f571d89c1 Remove some duplicate object dependencies for the RTSP demuxer. 
They are already covered by its dependency on the SDP demuxer.

Originally committed as revision 20324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:10:15 +00:00
Diego Biurrun
47e9f6217d Add missing rdt.o dependency for SDP demuxer. 
This fixes the build when the RTSP demuxer is disabled.

Originally committed as revision 20323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 22:03:02 +00:00
Baptiste Coudurier
72017ea1dc check stream index validity in av_program_add_stream_index 
Originally committed as revision 20319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:55:27 +00:00
Baptiste Coudurier
8425cecacc request mp3 frame_size to be set in has_codec_parameters, fix issue #1314 
Originally committed as revision 20318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 18:53:32 +00:00
Baptiste Coudurier
f2c061ec0f reindent after commit 
Originally committed as revision 20307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:20:08 +00:00
Baptiste Coudurier
7edbcfb79e In dump_format, print streams not associated with any program. 
Fixes issue #1366.

Originally committed as revision 20306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 02:12:10 +00:00
Reynaldo H. Verdejo Pinochet
cbd8a722bb Fix wrong comparison in r20304 
Originally committed as revision 20305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-19 01:42:05 +00:00
Reynaldo H. Verdejo Pinochet
9cf6bbb993 If missing, calculate width or height from bpp and 
image size lowering the probe score too.

Originally committed as revision 20304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 23:56:00 +00:00
Baptiste Coudurier
c3a58c4efc fix indentation 
Originally committed as revision 20300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 23:27:23 +00:00
Carl Eugen Hoyos
94ec3aca56 Support FourCC mjpa as MJPEG. 
Fixes issue 1492.

Originally committed as revision 20296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 22:43:19 +00:00
Baptiste Coudurier
807e4e81a8 mux all stream types except audio as one pes packet per avpacket, issue #1374 
Originally committed as revision 20292 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 21:41:03 +00:00
Baptiste Coudurier
7857d3ccf6 fix indentation and add braces 
Originally committed as revision 20289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:25:48 +00:00
Baptiste Coudurier
45a49840f3 handle_packets takes number of packets as arg, avoid reading too much 
Originally committed as revision 20288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:11:32 +00:00
Baptiste Coudurier
1303d62d84 Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t 
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 20:08:13 +00:00
Reynaldo H. Verdejo Pinochet
f122ef36b1 Smarten mtv's probe a bit. Check for non zero 
on bpp and width|height header fields. This
change is among the ones suggested by Vitor
Sessak in his '[FFmpeg-devel] [PATCH] Improve
MTV probe' thread.

Originally committed as revision 20283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 18:02:12 +00:00
Aurelien Jacobs
8da1d52cc1 remove old and useless debug code 
It uses the old, deprecated metadata API and prints exactly the same thing
as what ffmpeg/ffplay does.

Originally committed as revision 20280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 16:13:29 +00:00
Anton Khirnov
c4d438c265 Read metadata in WavPack files. 
Patch by Anton Khirnov (acronym("What You Should Know About Something"), gmail)

Originally committed as revision 20279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 15:28:53 +00:00
Anton Khirnov
2bd0758efa matroskaenc: Add support for writing chapters. 
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 20277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 12:17:01 +00:00
Diego Biurrun
15674f12be cosmetics: Break overly long lines. 
Originally committed as revision 20276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 10:47:40 +00:00
Kostya Shishkov
5d660598b0 Support more than 64 channels in RTMP input 
Originally committed as revision 20270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 07:01:06 +00:00
Kostya Shishkov
8f648b74c3 Accept RTMP packets with one-byte header 
Originally committed as revision 20269 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 06:58:00 +00:00
Kostya Shishkov
f836fa1706 Last parameter in RTMP "play" call was optional and some servers seem not to 
understand it, so drop it.

Originally committed as revision 20268 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-18 06:54:04 +00:00
Justin Ruggles
961057decd Remove unnecessary entries in ff_vorbiscomment_metadata_conv. VorbisComment 
keys are case-insensitive.

Originally committed as revision 20267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 21:30:50 +00:00
Vitor Sessak
a4cb675124 Avoid segfault for empty input files 
Originally committed as revision 20265 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 20:37:58 +00:00
Måns Rullgård
cf671d0543 Remove extraneous const keyword 
Originally committed as revision 20263 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 14:07:28 +00:00
Luca Abeni
56e6f8309e Emit the SDP lines in the correct order 
Originally committed as revision 20262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 11:15:45 +00:00
Carl Eugen Hoyos
bc2d2a07d5 Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0. 
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 14:46:06 +00:00
Justin Ruggles
68677dd8ed Log a clearer warning message when muxing FLV with Speex containing more than 
8 frames per packet.

Originally committed as revision 20247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 10:04:35 +00:00
Reimar Döffinger
c76911bd65 Split parts of dvdata.h into dvdata.c, this ensures that things like 
work_chunks_* and dv_idct_factor_* variables appear only once in the binary
instead of 3 times.
Saves 3264 bytes in .rodata and 312416 bytes in .bss on x86_64.

Originally committed as revision 20246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 07:55:57 +00:00
Justin Ruggles
046c400103 Add Speex support to the FLV muxer. 
Originally committed as revision 20245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-16 03:02:25 +00:00
Jai Menon
2e3ca1ffd0 Skip padding bytes correctly in ID3 tags. 
This fixes a regression introduced in r20170.

Originally committed as revision 20238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 13:55:19 +00:00
Justin Ruggles
0fa0fa296a 10l: update Makefile after rename 
Originally committed as revision 20236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:49:06 +00:00
Justin Ruggles
5855e4e0dd Rename aiff.c to aiffdec.c 
Originally committed as revision 20235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:46:56 +00:00
Justin Ruggles
47b47bbdaf Split up the AIFF muxer and demuxer into separate files. 
Originally committed as revision 20234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-15 09:45:16 +00:00
Reimar Döffinger
d8b35b8586 Add decoder for "forward uncompressed". 
Fixes issue 1467.

Originally committed as revision 20226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 18:15:57 +00:00
Reimar Döffinger
1e69999334 MXF: simply ignore tracks that are invalid due to not having a valid Sequence 
part instead of failing completely.
This partly fixes issue 1470 (broken files created by BBC ingex recorder).

Originally committed as revision 20221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 08:08:10 +00:00
Justin Ruggles
8746296818 Add Speex support to the Ogg muxer. 
Originally committed as revision 20220 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 01:46:19 +00:00
Justin Ruggles
24c6f152c4 Do not read data past the end of the SSND chunk in the AIFF demuxer. 
Fixes Issue 1455.

Originally committed as revision 20219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-13 00:19:34 +00:00
Carl Eugen Hoyos
dd9d5a1ef8 Support Midvid JPEG Video Codec (still flipped). 
Originally committed as revision 20218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 22:00:14 +00:00
Carl Eugen Hoyos
54089ecd5a Support Intel JPEG Library Video Codec (still flipped). 
Originally committed as revision 20217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:35:26 +00:00
Justin Ruggles
15299b3821 Calculate correct packet durations when demuxing Ogg/Speex. This involves 
determining if there is any delay in the first packet and/or any truncation in
the final packet.

Originally committed as revision 20216 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 21:30:03 +00:00
Reimar Döffinger
90aa6ace63 Merge declaration and initialization 
Originally committed as revision 20214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:38:08 +00:00
Reimar Döffinger
098d8e0950 Simplify: use FFMIN 
Originally committed as revision 20213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-12 16:36:48 +00:00
Daniel G. Taylor
febd1c90a6 Detect Windows Media DRM protected files and display warning if no key 
was provided.

Patch by Daniel G. Taylor, dan programmer-art org

Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-11 23:09:33 +00:00
Carl Eugen Hoyos
b8c0db9981 Allow autodetection of E-AC3. 
Originally committed as revision 20206 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-11 11:56:53 +00:00
Carl Eugen Hoyos
0096d766b9 Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS. 
Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-10 21:17:52 +00:00
Daniel Verkamp
54eb4ae0a2 Do not allow 0 sample rate in TMV demuxer 
Originally committed as revision 20195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-09 18:29:19 +00:00
Daniel Verkamp
f19ae9ea4d Stricter TMV probe 
Originally committed as revision 20194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-09 18:24:47 +00:00
Daniel Verkamp
70d8c762d9 Reindent 
Originally committed as revision 20182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 17:51:28 +00:00
Daniel Verkamp
811e0fc2e8 Add RF64 support to wav demuxer. 
Originally committed as revision 20181 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-06 17:50:10 +00:00
Anton Khirnov
7fd5aeb3e5 Only read ID3v1 tag if ID3v2 isn't present or is empty. 
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 21:36:56 +00:00
Anton Khirnov
41770abf86 id3v2: Export all text information frames with correct names. 
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 20:10:07 +00:00
Anton Khirnov
078d89a2b0 MP3 muxer: Write all metadata. 
Patch by Anton Khirnov <wyskas at gmail dot com>

Originally committed as revision 20170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 16:06:00 +00:00
Daniel Verkamp
79c0790789 Fix pcm_read_seek () when the position it calculates is greater than 2 GB. 
pcm_read_seek() puts the return value of url_fseek() in an int and then
compares < 0 to see if an error occurred; if the position is greater
than 2 GB, the 32-bit signed int result will be < 0.

Change the type of ret to int64_t to avoid the wraparound.

patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 20169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 09:19:42 +00:00
Ian Caulfield
63380b5e54 Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams. 
Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-05 08:38:39 +00:00
Carl Eugen Hoyos
e18027ac40 Add FIXME about low_delay vs has_b_frames. 
Originally committed as revision 20161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:40:52 +00:00
Wallak
f4a4be3f4e H264 allows B frames without requiring a >=1 sized buffer. 
Patch by wallak, wallak free fr

Originally committed as revision 20160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-03 19:30:09 +00:00
Reimar Döffinger
3fcb5113c6 wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of 
the file is reached normally, without any error.

Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:27:08 +00:00
Reimar Döffinger
e581b6288f wav: return av_get_packet errors unchanged. 
Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:22:44 +00:00
Reimar Döffinger
fbc6630168 Remove url_feof check that would be triggered only after incorrectly producing 
an empty packet and also av_get_packet already handles EOF now.

Originally committed as revision 20140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:05:52 +00:00
Reimar Döffinger
8a62a378de Remove useless setting of pkt->size, av_get_packet already handles that. 
Originally committed as revision 20139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 07:03:04 +00:00
Reimar Döffinger
a7a9dd0eb6 Return special EOF checking for aiff and au demuxers, the check was at 
the wrong place, causing an empty packet to be read before EOF was
detected and the eof detection is already now handled by av_get_packet anyway.

Originally committed as revision 20138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:42:20 +00:00
Reimar Döffinger
c3db0bc61d Return any error return values from av_get_packet, get_buffer etc. unchanged 
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:40:50 +00:00
Reimar Döffinger
7f7686dfb1 Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as 
appropriate if it couldn't read any data at all.
This should make handling of EOF and error simpler or make it work right without
extra code in a few place (e.g. raw demuxer).

Originally committed as revision 20135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 06:36:39 +00:00
Aurelien Jacobs
553e9f7529 matroskadec: cosmetics: indentation 
Originally committed as revision 20133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:15:36 +00:00
Aurelien Jacobs
ff0d5a745e matroskadec: don't overwrite extradata already read by ff_get_wav_header() 
Originally committed as revision 20132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:14:46 +00:00
Aurelien Jacobs
038146e9cf matroskadec: fix handling of A_MS/ACM track with no extradata 
Originally committed as revision 20131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 21:14:05 +00:00
Reimar Döffinger
22a7e19b50 Make rawvideo_read_packet return partial frames. 
This is consistent with other demuxers and also fixes a memleak (memory
allocated for partial frame data was leaked).

Originally committed as revision 20130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:32:22 +00:00
Reimar Döffinger
8cb724c5c4 Simplify: remove pointless {} and else 
Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:26:20 +00:00
Reimar Döffinger
d4c1803e0e Remove pointless setting of pkt->size, av_get_packet already handles this. 
Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:22:01 +00:00
Reimar Döffinger
b46c98bf66 au demuxer: pass av_get_packet error on unchanged instead of converting to 
AVERROR(EIO).

Originally committed as revision 20127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 17:08:33 +00:00
Reimar Döffinger
c67031e7cf av_new_packet failing should return ENOMEM, not EIO. 
Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 16:10:09 +00:00
Reimar Döffinger
43d7c6118d put_bits can only reliably write up to 31 bit bits, above it relies on 
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.

Originally committed as revision 20124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 15:40:29 +00:00
Aurelien Jacobs
e471e3c4a5 Fix playback of strange AVI files with stray LIST. 
sample: http://samples.mplayerhq.hu/avi/AV36_1.AVI
fix suggested by Michael

Originally committed as revision 20118 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-01 10:24:02 +00:00
Reimar Döffinger
f2ad907060 10l in code reading codec_name, the first byte is the length and should not 
become part of the string.

Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 18:27:39 +00:00
Reimar Döffinger
5dd76bd741 Return an error when the parsed mpc chunk size is negative, otherwise we 
might end up in an endless loop where the same chunk is parsed over and over.
Fixes a hang near the end for http://samples.mplayerhq.hu/A-codecs/musepack/sv8/sv8-tags.mpc

Originally committed as revision 20099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 13:35:13 +00:00
Reimar Döffinger
c9da676de4 Disable parsing for ogg streams where no ogg header was found, 
if no header was found the parser was not initialized and thus will
crash when trying to use it.

Originally committed as revision 20093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 09:46:48 +00:00
Reimar Döffinger
19635234b1 Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg 
must be valid UTF-8.

Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 09:43:56 +00:00
Reimar Döffinger
4b4ac5c7a8 Sync AC3 probe values with MP3 probe values, they have to avoid similar issues. 
This fixes ffmpeg-generated files with -acodec ac3 being detected as raw ac3
instead of MPEG.

Originally committed as revision 20075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:23:47 +00:00
Reimar Döffinger
f6765f3f04 Extend DV autodetection to also reliably detect single-frame DVs with 
a higher score that MAX/4.
It checks that there are at least 10 DIF headers and at least one per
24000 bytes, and if so considers the file reliably detected as DV.
Passes probetest, too.

Originally committed as revision 20074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:12:18 +00:00
Anton Khirnov
6378b06208 Add id3v2 metadata conversion table and use it in mp3 muxer. 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 07:05:03 +00:00
Baptiste Coudurier
a42bf19134 100l, typo 
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 21:06:18 +00:00
haim alon
7b5252ce3e Export mov/mp4 major and compatible brands as metadata. 
Patch by haim alon, haim dot alter at gmail dot com

Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 20:51:38 +00:00
Carl Eugen Hoyos
486168877e Fix reading VDR files (broken since r19000). 
Originally committed as revision 20017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 19:20:53 +00:00
Reimar Döffinger
98422c44cf Fix possible buffer over-read in vorbis_comment, fix it double to be sure. 
First, make s signed, so that comparisons against end - p will not be made as
unsigned, making the check incorrectly pass if p is beyond end.
Also ensure that p will never be > end, so the code is correct also if
buf is not padded.

Originally committed as revision 20014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 15:37:09 +00:00
Anton Khirnov
20c6837880 id3v2: Add support for UTF-16 encoding. 
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 18:22:00 +00:00
Anton Khirnov
9aa1bcce51 id3v2: Use 0 instead of '\0'. 
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 18:10:29 +00:00
Anton Khirnov
787f8fad00 id3v2: check for enough space to write full UTF-8 characters. 
patch by Anton Khirnov, wyskas gmail com

Originally committed as revision 20004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 18:04:40 +00:00
Reimar Döffinger
7d507ceb79 Correctly print number of remaining bytes in oggparsevorbis instead of always 
with inverted sign.

Originally committed as revision 19978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 09:18:23 +00:00
Benjamin Larsson
61dc238b45 Hook up the MD studio demuxer and Atrac1 decoder. 
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 17:28:03 +00:00
Diego Biurrun
de653ba3bb Place MP3 demuxer code under appropriate #ifdefs. 
Fixes compilation with --disable-optimizations --disable-demuxers.

Originally committed as revision 19964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 12:39:19 +00:00
Diego Biurrun
8f771e76fd Rearrange wav_muxer and {wav|w64}_demuxer blocks to be under proper #ifdefs. 
Fixes compilation with --disable-optimizations --disable-demuxers.

Originally committed as revision 19961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 11:19:36 +00:00
Diego Biurrun
738914be66 Move find_guid function and guid_data array to a globally available place. 
Fixes compilation with --disable-optimizations --disable-demuxer=w64.

Originally committed as revision 19959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-22 10:31:29 +00:00
Diego Biurrun
e9b733bd89 #include correct header to fix 'make checkheaders'. 
AVCodecTag is declared in riff.h, not avformat.h.

Originally committed as revision 19915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 19:51:05 +00:00
Michael Niedermayer
e9b0681610 Only use *ic_ptr when it has been initialized. 
Originally committed as revision 19911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 13:19:13 +00:00
Ronald S. Bultje
ba93ea6d3e Unscrewup indentation (pointed out by Diego). 
Originally committed as revision 19910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-18 13:18:47 +00:00
Ronald S. Bultje
f933789789 RTSP basic authentication, patch originally by Philip Coombes 
(philip coombes zoneminder com), see "[PATCH]RTSP Basic Authentication"
thread on mailinglist.

Originally committed as revision 19905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 21:47:11 +00:00
Niobos
9deba199fd fix pes overhead computation, patch by Niobos, niobos at dest-unreach dot be 
Originally committed as revision 19902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 19:07:09 +00:00
Baptiste Coudurier
db46c4e14d print at debug level the score at which codec probing succedeed 
Originally committed as revision 19899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:46:50 +00:00
Reimar Döffinger
5abfae79ca Improve SIFF probe by also checking the first tag is one of the expected. 
Originally committed as revision 19898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:09:20 +00:00
Reimar Döffinger
3214db98ea Improve dxa probe by checking the values for width and height are reasonable. 
Originally committed as revision 19897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:08:07 +00:00
Reimar Döffinger
892d7e78ef Slightly improve probe for ea format by checking that it is possible to 
guess whether the file is little- or big-endian.

Originally committed as revision 19896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 18:07:27 +00:00
Lars Täuber
f68c8a5039 Do not include "mp4:" prefix from RTMP URL into "app" path or second time 
into playpath.

Patch by Lars Täuber
(<$name> . <$lastname with umlaut replaced with diphtong> @ <gmx> . <net>)

Originally committed as revision 19894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-17 05:31:02 +00:00
Michael Niedermayer
1bc8c36125 Print a warning if a format has been detected with a low score. 
Originally committed as revision 19890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 20:44:26 +00:00
Michael Niedermayer
c36823fd3d Print at debug level the score with which probing succeeded. 
Originally committed as revision 19889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 20:23:04 +00:00
Michael Niedermayer
8a6c7a5286 Fix indention after last commit. 
Originally committed as revision 19888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 20:06:48 +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
Kostya Shishkov
ebd3e99de9 reindent after last commit and remove unneeded empty line 
Originally committed as revision 19885 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 18:06:29 +00:00
Kostya Shishkov
f53c9089f6 Make MPC SV8 probe skip tags until stream header is found 
Originally committed as revision 19884 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 18:05:21 +00:00
Reimar Döffinger
0d6da4b831 Fix overflow check insufficiently improved in r19840. 
It assumes that sizeof(vmd_frame) < 64k, otherwise an additional
check to ensure sound_buffers <= UINT_MAX / sizeof(vmd_frame) would be necessary.

Originally committed as revision 19882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 15:12:23 +00:00
Peter Ross
5f14b56593 Core Audio Format demuxer 
Originally committed as revision 19879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 12:26:59 +00:00
Peter Ross
2d423666c0 Make mov LPCM and AAC parsing functions public 
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 11:35:01 +00:00
Kostya Shishkov
9117213313 Enhance Musepack SV8 probing code 
Originally committed as revision 19874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 04:43:33 +00:00
Michael Niedermayer
e458dd0be0 Flv should be AVFMT_VARIABLE_FPS. 
Originally committed as revision 19873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 01:49:34 +00:00
Michael Niedermayer
657eca1f8b Upgrade a few important messages to AV_LOG_WARNING. 
Originally committed as revision 19872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 01:47:54 +00:00
Michael Niedermayer
0355537605 Fix indention after previous commit. 
Originally committed as revision 19871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 01:17:39 +00:00
Michael Niedermayer
ddce56efc5 Make packet interleaving in the muxer not scan through the whole 
buffer when simply appending at the end works.
Much faster if one stream ends prematurely.
Fixes issue1379.

Originally committed as revision 19870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 00:59:15 +00:00
Michael Niedermayer
42831b46ef Also reset *_end in flush_packet_queue(). 
Originally committed as revision 19869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 00:56:31 +00:00
Justin Ruggles
ea25c063c3 10l: set genre default immediately before reading genre tag 
Originally committed as revision 19867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 23:40:10 +00:00
Justin Ruggles
d891cbb444 Set ID3v1 genre to 0xFF (unknown) by default instead of 0 (Blues). 
Originally committed as revision 19866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 23:37:54 +00:00
Kostya Shishkov
9155be47d1 Do not set 0 FPS in VC-1 test stream format demuxer. 
Originally committed as revision 19863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 16:36:53 +00:00
Kostya Shishkov
05db409c28 Check for explicit 32-bit FPS value so it works on 64-bit systems too 
Originally committed as revision 19861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 15:28:11 +00:00
Kostya Shishkov
23218a9801 Make probing for VC1 test bitstream format stricter 
Originally committed as revision 19860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 15:22:36 +00:00
Michael Niedermayer
37e34df5a5 Check offset in flv_probe() 
Originally committed as revision 19858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 14:56:09 +00:00
Michael Niedermayer
0535f919d5 Do not return values above AVPROBE_SCORE_MAX from probe(). 
Originally committed as revision 19857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 13:28:14 +00:00
Michael Niedermayer
2a3caca2b1 Make h261 and mpegvideo probe a little more robust so they dont fail with 
slightly different probetest.

Originally committed as revision 19856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 13:27:13 +00:00
Michael Niedermayer
c4674a479b Make mpeg_probe() pass probetest. 
Originally committed as revision 19854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 12:20:03 +00:00
Reimar Döffinger
3489e150d9 Slightly stricter MPEG-PES probing, fixes issue 1383. 
Originally committed as revision 19852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 10:01:25 +00:00
Reimar Döffinger
5837e4ca33 Vastly improved mm_probe function, passes probetest. 
Originally committed as revision 19851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 09:21:29 +00:00
Reimar Döffinger
97e078087b Improve sierravmd probe. It is still quite weak, but further improvements 
are non-obvious and probably need a large (about 1kB at least) probe buffer.

Originally committed as revision 19850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-15 09:16:29 +00:00
Michael Niedermayer
1ac9563075 Slighty tweak mp3 probe threshold to prevent probetest from complaining. 
Originally committed as revision 19849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 23:03:33 +00:00
Reimar Döffinger
6377de611a Try harder to avoid false positives for DV probe. 
Require at least one signature match per provided 1MB of probe data,
and if there is only a single match, return at most MAX/4.
Fixes issue1382 but could/should probably still be improved.

Originally committed as revision 19848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 22:03:07 +00:00
Reimar Döffinger
98487a5b69 Make dnxhd probe more strict, fail if we detect values in header that would 
make our decoder fail anyway.
dnxhd probe now passes probetest.

Originally committed as revision 19847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 21:50:23 +00:00
Michael Niedermayer
89c4e176f6 Rewrite h261_probe(). 
New code can detect h261 startcodes even when the first is damaged or not at the
begin. It also passes probetest v2 & v3.

Originally committed as revision 19845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 21:29:19 +00:00
Reimar Döffinger
05bdd33a12 Make DTS probe more robust against false positives (as e.g. probetest shows). 
In particular check that the detected markers clearly indicate a specific DTS
format (a wild mixture of e.g. little- and big-endian markers is unlikely to be
a valid DTS file) and ensure the markers appear with sufficient frequency.

Originally committed as revision 19844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 20:28:10 +00:00
Reimar Döffinger
9f449d57c7 Check the index validity more thoroughly for the c93 probe function. 
In particular, check that length of the first index entries is not 0 since
that is interpreted "end of file" and makes no sense in the very first entries.

Originally committed as revision 19843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 20:01:32 +00:00
Reimar Döffinger
ddbb7c9be2 Add more sanity checks for header elements, rejecting files with clearly 
invalid values that wouldn't play right anyway and reduce probe score to MAX/2.
Passes probetest v2.

Originally committed as revision 19842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 19:58:51 +00:00
Michael Niedermayer
e4c01d408a Rewrite h263_probe(). 
The new code should detect h263 even if the first startcode is damaged or
somewhere else than the first byte. It also passes probetest v2 as just
posted on ffmpeg-dev.

Originally committed as revision 19841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 19:06:36 +00:00
Reimar Döffinger
21ab5c5827 Extend check for integer overflow for malloc argument to take into account 
also the addition of "sound_buffers" not only the multiplication.

Originally committed as revision 19840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 17:15:18 +00:00
Kostya Shishkov
65d6d40350 Fix wrong logical operator which causes too relaxed checking in VC-1 test 
format probe.
Spotted by Reimar Döffinger.

Originally committed as revision 19839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 17:05:13 +00:00
Reimar Döffinger
8466ab59b2 Check buffer size for idcin check, otherwise false positives are too likely for 
small probe buffer sizes due to 0-padding (see probetest results).

Originally committed as revision 19838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-14 15:44:05 +00:00
Baptiste Coudurier
8bb7dda2f7 ensure pes buffer is set to avoid segv 
Originally committed as revision 19836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 20:08:47 +00:00
Baptiste Coudurier
8956f68014 reset pes state to skip after flushing, avoid segv with dvgrab-2009.03.28_19-07-22.m2t 
Originally committed as revision 19835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 20:06:49 +00:00
Benjamin Larsson
000b8b8699 Add condition to aea demuxer probe. 
Originally committed as revision 19833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 18:27:53 +00:00
Reimar Döffinger
cbb5da57cd When resetting vst->pkt.data to NULL, also set vst->slices. 
This avoids a crash when the next slice is not a start slice and thus
pkt->data is still NULL.
This probably only happens with broken or unsupported files like
http://samples.mplayerhq.hu/real/multirate/JustaSpa1937_64kb.rm
that need further fixes, but keeping vst state consistent is still a good idea.

Originally committed as revision 19830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-13 11:08:59 +00:00