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
Ivan Schreter
dbe0ad85c1
Use I/O buffer size as initial value for backoff for seeking sync point search.
...
Originally committed as revision 19829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 08:57:30 +00:00
Benjamin Larsson
61d00297ab
Cosmetics, add spaces
...
Originally committed as revision 19816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 19:12:13 +00:00
Benjamin Larsson
d0b57c6f85
Initial commit of the MD studio demuxer, not hooked up yet
...
Originally committed as revision 19812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-10 18:48:12 +00:00
shinya.tesutosan@hotmail.com
e5f58f81f7
Document padding for AVProbeData.
...
Patch by roundup user shinya, tesutosan hotmail
Originally committed as revision 19802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 22:55:10 +00:00
Maksym Veremeyenko
2c14ded386
Fix a bug with reading non-interleaved AVI if one the streams is
...
shorter.
Patch by Maksym Veremeyenko, verem m1stereo tv
Originally committed as revision 19798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:26:24 +00:00
Maksym Veremeyenko
b60de406a4
Factorise st->nb_index_entries check.
...
Patch by Maksym Veremeyenko, verem m1stereo tv
Originally committed as revision 19797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-09 16:25:12 +00:00
Baptiste Coudurier
e4bc8af1e6
check entries against field_size, potential malloc overflow in read_stsz, fix #1357
...
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:42:51 +00:00
Baptiste Coudurier
1c4bf2ec37
add one missing check for stream existence in read_elst, fix #1364
...
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:36:33 +00:00
Martin Storsjö
b126dee964
Use all 32 bits of the timestamp when calculating flv duration.
...
At the moment, duration is mainly set from the metadata packet. If that is not
available, the fallback is checking the low 24 bits of the last packet. This is
not enough for files over 4,6 hours in length, so read all 32 bits instead.
patch by Martin Storsjö, martin martin st
Originally committed as revision 19791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 10:49:51 +00:00
Ivan Schreter
af8aae3fa3
disable new seeking code in mpeg-ts per #ifdef (use old read_seek by default)
...
Originally committed as revision 19788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 15:59:32 +00:00
Reimar Döffinger
88e70e1b0a
ff_rm_metadata is const.
...
Originally committed as revision 19786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 08:57:19 +00:00
Reimar Döffinger
ed034f6c59
ff_id3v1_genre_str table should be const.
...
Originally committed as revision 19781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 08:39:41 +00:00
Reimar Döffinger
4d2a4dfd88
100l, all avlanguage tables should be both static and const.
...
Originally committed as revision 19780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 08:36:25 +00:00
Ivan Schreter
7a656933c9
cosmetic changes (indentation, doxygen comments, braces, put structures for API to header, ...)
...
Originally committed as revision 19773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-05 19:31:01 +00:00
Reimar Döffinger
61e8efd35e
Search for ipmovie signature beyond the start of the file.
...
This allows to play directly files that combine player and movie into
a single executable like http://samples.mplayerhq.hu/game-formats/interplay-mve/DES3S.EXE
Originally committed as revision 19769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-05 15:41:32 +00:00
Reimar Döffinger
78bfe6c3c1
Extend ipmovie signature to match exactly one place in mve files that have a
...
player binary prepended.
Originally committed as revision 19768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-05 11:30:55 +00:00
Justin Ruggles
d2a47a578e
Remove fake Speex header creation from FLV demuxer. Having it there was not the
...
correct solution to the problem. A better solution might be possible later once
Speex is supported in muxers.
Originally committed as revision 19761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-04 21:43:41 +00:00
Justin Ruggles
1d07029fea
Add frame_size as a codec parameter requirement for Speex in
...
av_find_stream_info(). It forces decoding of a packet when there is no
Speex header in order to determine the correct frame size.
Originally committed as revision 19760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-04 21:38:45 +00:00
Josh Harris
f2086fb50e
Fix incorrect display of ASF/WMV duration after r12926.
...
Patch by Josh Harris, qt tateu net
Originally committed as revision 19748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-30 18:14:22 +00:00
Justin Ruggles
eb5f3c5434
Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat
...
a packet of Speex frames as a single frame.
Originally committed as revision 19734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-28 00:44:54 +00:00
Ivan Schreter
608be2acef
Cosmetic changes in read_seek* routines.
...
Originally committed as revision 19723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 22:33:48 +00:00
Christian Schmidt
5dd3707b8d
Decoder for LPCM as used in Bluray discs.
...
Patch by Christian Schmidt, schmidt digadd de
Originally committed as revision 19722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 22:10:35 +00:00
Reimar Döffinger
44ed34b790
Check for seek failures in avi_load_index, otherwise if the index offset
...
is invalid (e.g. truncated file) we might end up reading the whole file
since trying to seek beyond the end of file does not set EOF.
Originally committed as revision 19709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 08:38:44 +00:00
Baptiste Coudurier
6aa333471c
return AVERROR(ENOMEM) if stream could not be allocated
...
Originally committed as revision 19702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 19:59:38 +00:00
Kent Mein
b01c7b756e
check av_new_stream return value, patch by Kent Mein, mein at cs dot umn dot edu
...
Originally committed as revision 19701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 19:58:21 +00:00
Maksym Veremeyenko
7305d97f04
Do not read index chunks as audio/video data; closes issue 1336.
...
patch by Maksym Veremeyenko, verem m1stereo tv
Originally committed as revision 19700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 09:46:16 +00:00
Stephen Backway
c58b82a29b
Add Bluray Subtitle Support
...
Patch by Stephen Backway, stev391 A exemail D com D au
Originally committed as revision 19699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 08:47:39 +00:00
Reimar Döffinger
49056037a8
Mark video from .mtv files correctly as upside-down.
...
Originally committed as revision 19698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 07:47:34 +00:00
Måns Rullgård
cf5ec60740
mpegts: change variable-length array to fixed length
...
The difference between 188 and 204 is not worth worrying about.
Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-24 21:42:25 +00:00
Aurelien Jacobs
429eeecd5a
matroskadec: add correct extradata offset for V_MS/VFW/FOURCC tracks
...
Originally committed as revision 19694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-24 13:43:33 +00:00
Aurelien Jacobs
e26444079c
matroskadec: factorize some code
...
Originally committed as revision 19693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-24 13:40:30 +00:00
Ivan Schreter
a8dd8dc6e9
Use generic multi-stream key frame finding routine to implement read_seek2 and map
...
read_seek to read_seek2.
Originally committed as revision 19681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-22 16:07:50 +00:00
Ivan Schreter
101036adb9
Support for generic multi-stream key frame finding for new seek API.
...
Originally committed as revision 19680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-22 16:05:43 +00:00
Bartlomiej Wolowiec
ab1eff9c5c
Add support for S/PDIF encapsulation.
...
Originally committed as revision 19674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-21 08:34:19 +00:00
Peter Ross
c0b88f1920
Moves the display of metadata to dump_format()
...
Originally committed as revision 19632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-12 13:17:39 +00:00
Matti Hamalainen
5f71844e78
Parse ID3 tags in Musepack SV7 files
...
Patch by Matti Hamalainen (mhamalai@students.oamk.+358)
Thread: [PATCH] 6/6 Add parsing of ID3v2 tags in Musepack SV7 demuxer
Originally committed as revision 19631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 17:28:56 +00:00
Matti Hamalainen
311f96a8cc
Parse APE metadata tags in Musepack SV7 files
...
Patch by Matti Hamalainen (to get his mail address remove common endings from
"mhamalainen@studentsnen.oamknen.finen")
Thread: [PATCH]5/6 Add APE tag metadata reading support in Musepack SV7 demuxer
Originally committed as revision 19630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 17:18:10 +00:00
Kostya Shishkov
191e34cd67
Move APE tag parsing into separate module.
...
Based on patch by Matti Hamalainen (mhamalai<mot>students<punkt>oamk<punkt>)
Originally committed as revision 19629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 17:08:09 +00:00
Matti Hamalainen
6984380c61
Do not use internals of ByteIOContext during APE tags parsing.
...
Patch by Matti Hamalainen, mail = reverse("if.kmao.stneduts@ialamahm")
Thread: [PATCH] 2/6 Fix broken APE tag key handling
Originally committed as revision 19628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 16:55:49 +00:00
Matti Hamalainen
22667e40be
Remove incorrect APE tag size adjustment based on flags.
...
Patch by Matti Hamalainen (mhamalai <luona> students <piste> oamk <piste> fi)
Thread: [PATCH] 1/6 Remove incorrect APE tag size adjustment based on flags
Originally committed as revision 19627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-11 16:43:44 +00:00
Aurelien Jacobs
7a9c86e9f8
avidec: simplify, using av_rescale_q() instead of av_rescale()
...
Originally committed as revision 19624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 20:53:32 +00:00
Aurelien Jacobs
2bf74f4955
actually define AVSEEK_FLAG_FRAME as described in avformat_seek_file() doc
...
Originally committed as revision 19623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 20:48:05 +00:00
Aurelien Jacobs
8306be9c3b
matroskadec: disable h264 parser as long as it totally mess up frame type
...
Originally committed as revision 19622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 18:12:02 +00:00
Aurelien Jacobs
194d4b494b
matroskadec: correctly parse flags for simpleblock frames
...
Originally committed as revision 19621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 18:06:14 +00:00
Diego Biurrun
c5e86106fb
cosmetics: whitespace, prettyprinting, coding style fixes
...
Originally committed as revision 19618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 16:35:36 +00:00
Daniel Verkamp
740e89cf83
Sony Wave64 demuxer
...
patch by Daniel Verkamp, daniel drv nu
Originally committed as revision 19617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-10 16:27:33 +00:00
Aurelien Jacobs
188842ef7a
fix riff subtitle timebase
...
Originally committed as revision 19607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-07 23:57:52 +00:00
Ramiro Polla
c15508dc93
Use enums instead of int.
...
Originally committed as revision 19568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-02 17:42:40 +00:00
Kostya Shishkov
9fd6b84360
RTMP protocol support (as a client)
...
Originally committed as revision 19556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-31 06:49:36 +00:00
Baptiste Coudurier
46c9eb57d0
cosmetics, remove spaces after '(' and before ')'
...
Originally committed as revision 19547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 19:14:57 +00:00
Baptiste Coudurier
0fd7cf116b
init pes dts and pts to AV_NOPTS_VALUE, fix issue #1297
...
Originally committed as revision 19546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 18:29:06 +00:00
Ronald S. Bultje
7a4a64e7ab
Remove old_flags variable, which is a duplicate of the flags variable.
...
Originally committed as revision 19540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 15:05:33 +00:00
Ronald S. Bultje
34bddc39b4
Don't use a pointer-to-flags/timestamp in ff_rm_parse_packet(); the function
...
used to return packet data, which might update the flags/timestamp to be
used for the next packet data returned by the demuxer. However, that was
separated out into a new function, and the flags/timestamp are thus never
updated within ff_rm_parse_packet() anymore, and thus do not need to be
a pointer.
Originally committed as revision 19539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 15:04:19 +00:00
Baptiste Coudurier
e4b8d05d47
return EOF in image2 demuxer
...
Originally committed as revision 19538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 08:21:11 +00:00
Diego Biurrun
18b55f639a
Remove pointless '#ifdef DEBUG' around dprintf macro.
...
Originally committed as revision 19535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 17:12:47 +00:00
Baptiste Coudurier
d46c84ea31
Stop parsing in read_header only after finding pmt, and
...
do not close pat filter so further pmt can be parsed.
Fix issue #1294 .
Originally committed as revision 19530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 02:17:08 +00:00
Niobos
1aae34890c
rename freq to period which is more correct, patch by Niobos, niobos dot be at gmail dot com
...
Originally committed as revision 19529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-28 17:51:12 +00:00
Ronald S. Bultje
acfe8faf29
Cosmetics: remove spaces between function name and arguments in declaration,
...
and put return type ("static void") on the same line as function name.
Originally committed as revision 19519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:32:54 +00:00
Colin McQuillan
202a6697ba
Use named initializers and use new/free_context() instead of extradata()
...
for context allocators. Patch by Colin McQuillan m niloc googlemail com.
Originally committed as revision 19518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:29:06 +00:00
Ronald S. Bultje
fccb1770e6
Implement support for EOS as used by WMS and other RTSP servers that do not
...
implement RTCP/bye. See "[PATCH] rtsp.c: EOS support" thread from a few
months back.
Originally committed as revision 19517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:03:53 +00:00
Ronald S. Bultje
c2f3eec445
Implement RTSP-MS/ASF packet parsing - this completes RTSP-MS support. See
...
discussion in "[PATCH] RTSP-MS 14/15: ASF packet parsing" thread on mailinglist.
Originally committed as revision 19516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 14:00:10 +00:00
Martin Storsjö
fbf7e805b0
Only consider -1 as an error return value for open().
...
This is:
- what Posix says (-1 on error, >=0 on success)
- fixing a bug on winCE (<0 sometimes)
Patch by Martin Storsjö: martin martin st
Originally committed as revision 19513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-27 12:36:22 +00:00
Ronald S. Bultje
2078ca16ee
Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
...
ASF packet parsing" thread for discussion / reasoning.
Originally committed as revision 19509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 19:09:35 +00:00
Måns Rullgård
63613fe615
Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
...
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Aurelien Jacobs
84c04e2519
fix various compilation dependencies
...
Originally committed as revision 19507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 21:28:44 +00:00
Aurelien Jacobs
23251d751b
fix compilation of cavsvideo demuxer
...
Originally committed as revision 19506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 21:28:03 +00:00
Kostya Shishkov
b31ac3c8dd
Register some additional AMF types in libavformat/flv.h
...
Originally committed as revision 19476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-21 07:18:14 +00:00
Stefano Sabatini
58ad770f92
Use globally consistent include guard names.
...
Originally committed as revision 19462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-19 09:38:58 +00:00
Art Clarke
ebb82604b0
Only free '*ic_ptr' when a caller has pre-allocated a context and passed it in
...
(wherein av_open_input_file assumes memory ownership).
Patch by Art Clarke a<surname> xuggle com
Originally committed as revision 19436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-15 10:00:16 +00:00
Martin Storsjö
73c1326809
Use ff_neterrno instead of errno in tcp.c.
...
If ff_neterrno() is checked instead of errno, that's probably what should be
used in the return value.
As a sideeffect, this gives better compatibility with Windows (CE), where
network errors aren't visible in errno.)
patch by Martin Storsjö, martin martin st
Originally committed as revision 19433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-15 05:52:49 +00:00
İsmail Dönmez
b504ce57ed
Only #define lseek to _lseeki64 on MinGW, not MinGW CE.
...
This fixes compilation on WinCE, which does not support _lseeki64.
patch by Ismail Dönmez, ismail namtrac org
Originally committed as revision 19425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-13 17:16:36 +00:00
Diego Biurrun
647c2356a6
Make (de)muxers for format variants select the main format (de)muxer.
...
It makes little sense to enable the variant without the main format.
Originally committed as revision 19420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 22:31:05 +00:00
Phil Rutschman
5a1e202b87
Add block_align to sox input.
...
Patch by Phil Rutschman: name.surname modsystems com
Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:52:56 +00:00
Art Clarke
56c6cf287b
Fix mem leak when user preallocates an AVFormatContext, passes it to
...
av_open_input_file(), but the file does not exist.
Patch by Art Clarke a$(surname) xuggle com
Originally committed as revision 19370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 08:26:57 +00:00
Aurelien Jacobs
df2bd71aeb
flvdec: expose metadata through the generic metadata API
...
original patch from Art Clarke aclarke _at_ xuggle _dot_ com
Originally committed as revision 19364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:54:37 +00:00
Aurelien Jacobs
09e54e1ff8
flvdec: re-enable metadata parsing
...
duration and videodatarate values are actually useful
original patch from Art Clarke aclarke _at_ xuggle _dot_ com
Originally committed as revision 19363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:49:33 +00:00
Aurelien Jacobs
8caa0f0651
flvdec: don't set format and codec context from metadata values
...
This has proven to be useless and even harmfull since r18460 (expect
for duration and videodatarate).
original patch from Art Clarke aclarke _at_ xuggle _dot_ com
Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:46:37 +00:00
Reimar Döffinger
96f0731a26
Check for packet_length 0, it is already treated as invalid by the padding check,
...
but that resulted in a confusing/wrong error message.
Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 17:08:32 +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
Reimar Döffinger
11d058b7b3
Replace invalid Theora frame rate by 25 FPS.
...
Avoids division by 0 due to e.g. time_base denominator being 0.
Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:31:09 +00:00
Reimar Döffinger
3dcddf82ed
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
...
or with extremely large extradata.
Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:27:52 +00:00
Reimar Döffinger
5a4a4d7839
Check size of "strf" header against size of enclosing "LIST" if there is one.
...
Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:26:14 +00:00
Reimar Döffinger
b098b30905
Fix indentation
...
Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:56 +00:00
Reimar Döffinger
68a10b40bc
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.
...
Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-03 11:18:07 +00:00
Michael Niedermayer
e7e5d1e990
If either of num or den is 0 make both 0 in av_set_pts_info().
...
Originally committed as revision 19326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-02 12:47:58 +00:00
Michael Niedermayer
d218a86a0d
Make sure av_set_pts_info() does not set the fields of a timebase to
...
negative values.
Originally committed as revision 19325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 20:52:48 +00:00
Michael Niedermayer
dec14949a6
Make arguments of av_set_pts_info() unsigned.
...
Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
Originally committed as revision 19319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-01 18:50:31 +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
Alex Converse
ad92558754
Use av_log_missing_feature in the ADTS encoder. (Pseudo reverts r19173).
...
Originally committed as revision 19299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 22:48:07 +00:00
Stefano Sabatini
38e54a75ab
Make the configure script select the input/output devices using
...
--enable-indev, --enable-outdev rather than --enable-demuxer,
--enable-muxer as before, same for disabling them.
Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:49:15 +00:00
Michael Niedermayer
d004179e19
indent
...
Originally committed as revision 19292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:37:29 +00:00
Michael Niedermayer
3fd5a75b07
id3v2.4.0 uses syncsafe integers for sizes of frames.
...
Fixes issue1234
Fixes regression introduced in r19275
Originally committed as revision 19291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-29 18:36:49 +00:00
Stefano Sabatini
2b75bde648
Remove inconsistent use of a @brief command in av_write_trailer()
...
doxy.
Originally committed as revision 19289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-28 21:05:46 +00:00
Stefano Sabatini
d1b9adf252
Use consistently the third person in doxy, as recommended by the
...
javadoc specs.
Originally committed as revision 19288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-28 21:01:51 +00:00
Michael Niedermayer
1cd4422163
Fix id3v2.2 frame size parsing.
...
Fixes issue1202.
Originally committed as revision 19276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:44:44 +00:00
Michael Niedermayer
47f42aec38
Fix id3v2.3/4 tag size parsing.
...
Fixes issue1106
Originally committed as revision 19275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:26:39 +00:00
Baptiste Coudurier
57011a13d6
use AVFormatContext->probesize in av_find_stream_info and raise default to 5M
...
Originally committed as revision 19274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:10:27 +00:00
Baptiste Coudurier
d23612efe1
Only set CODEC_ID_PROBE when a packet from a stream having a PES header
...
is read.
Originally committed as revision 19273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:01:16 +00:00
Baptiste Coudurier
af122d6a80
limit raw packet buffer size used for codec probing
...
Originally committed as revision 19272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 18:48:57 +00:00
Baptiste Coudurier
d862fce758
only set par if it does not indicates a rotation, ex iphone 3GS
...
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 00:17:47 +00:00
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