Michael Niedermayer
0fd9e6f34a
make the asf demuxer resistant against insertion/deletion errors
...
Originally committed as revision 7672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 21:25:06 +00:00
Michael Niedermayer
f7835507cb
consistant error return for asf_get_packet()
...
Originally committed as revision 7657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:38:33 +00:00
Michael Niedermayer
92216453db
better padsize check
...
Originally committed as revision 7656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:33:26 +00:00
Michael Niedermayer
0b93103a31
more correct error message
...
Originally committed as revision 7655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:31:40 +00:00
Michael Niedermayer
ceba96cb26
replace wrong return 0 by -1
...
Originally committed as revision 7654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:28:56 +00:00
Michael Niedermayer
13f7e4b966
check to detect nonsense fragment size
...
Originally committed as revision 7653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:17:54 +00:00
Michael Niedermayer
1ae7518dda
inden(ta)tion
...
Originally committed as revision 7652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:06:46 +00:00
Michael Niedermayer
200026aae4
replace nonsense code by something which makes at least some sense
...
Originally committed as revision 7651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:01:01 +00:00
Michael Niedermayer
4c71d72701
check fragment offset and size
...
yes this too could have been exploitable ...
Originally committed as revision 7650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 16:37:45 +00:00
Michael Niedermayer
ae60a85780
move frame header reading into its own function
...
Originally committed as revision 7649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:55:23 +00:00
Michael Niedermayer
b04d5d3116
more correct packet alignment check and correction
...
Originally committed as revision 7648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:52:49 +00:00
Michael Niedermayer
5e2a485507
10l
...
Originally committed as revision 7647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:33:10 +00:00
Michael Niedermayer
4e15cc8ba3
cosmetics (aligne stuff nicely)
...
Originally committed as revision 7645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:04:55 +00:00
Michael Niedermayer
d045b8c14b
get rid of some sensless malloc/free
...
Originally committed as revision 7644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:03:47 +00:00
Michael Niedermayer
916bb12c90
simplify
...
Originally committed as revision 7643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:01:27 +00:00
Michael Niedermayer
6bb2a2dfb9
remove a few unused and duplicated variables
...
Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 10:53:57 +00:00
Michael Niedermayer
0521946359
adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
...
note, the original code might have been exploitable
Originally committed as revision 7640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 03:19:00 +00:00
Michael Niedermayer
b83e83b915
cosmetic
...
Originally committed as revision 7639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:21:16 +00:00
Michael Niedermayer
fc9eb13732
these variables seem to be unused on the demuxer side so theres no sense in setting them
...
Originally committed as revision 7636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 00:20:58 +00:00
Michael Niedermayer
236116cb4c
get rid of a few idiotic asserts()
...
Originally committed as revision 7632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:03:09 +00:00
Michael Niedermayer
b586d9eac3
useless &0x80
...
Originally committed as revision 7631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:46:14 +00:00
Michael Niedermayer
fe468b331a
remove sensless casts
...
Originally committed as revision 7612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:15:55 +00:00
Michael Niedermayer
24c14d6d01
simplify GUIDs
...
Originally committed as revision 7611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:06:19 +00:00
Michael Niedermayer
b086d4ff9c
fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
...
Originally committed as revision 7539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 23:47:53 +00:00
Patrice Bensoussan
62ade082bb
Decode genre on asf/wma files.
...
patch by patrice.bensoussan _at_ free.fr
Originally committed as revision 7379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 00:24:24 +00:00
Ryan Martell
73fe1052dd
Minor modifications to handle mms streaming.
...
Patch by Ryan Martell rdm4 martellventures com.
Originally committed as revision 7221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-04 15:46:32 +00:00
Zuxy Meng
db5c43b4c7
Use common macro PUT_UTF8 in asf.c
...
Patch by Zuxy Meng, % zuxy P meng A gmail P com %
date: Nov 5, 2006 9:56 AM
subject: [Ffmpeg-devel] PUT_UTF8 & asf format enhancement
Originally committed as revision 7059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 14:37:59 +00:00
Steve L'Homme
949b1a13bf
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
...
patch by Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Aurelien Jacobs
7fbde3431a
replace coder/decoder file description in libavformat by muxer/demuxer
...
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 08:57:54 +00:00
Dominik Mierzejewski
ccd3228e54
Use proper PRI?64 macros for %ll? format to fix printf format warnings:
...
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
asf.c:872: warning: format ‘%Lx’ expects type ‘long long unsigned int’, but argument 4 has type ‘int64_t’
mov.c:1754: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 5 has type ‘int64_t’
Approved by Michael.
Originally committed as revision 6692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-14 20:43:39 +00:00
Diego Biurrun
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Michael Niedermayer
5b11e08171
prevent infinite loop with VORC012.WMA
...
Originally committed as revision 6361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 21:19:47 +00:00
Måns Rullgård
191e8ca752
fix some signedness warnings
...
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:47:39 +00:00
Michael Niedermayer
52e5461288
fix fallback if theres no index
...
fix index less seeking
Originally committed as revision 6055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 20:24:58 +00:00
Michael Niedermayer
56c96a229b
read and use index (based on a patch by John Donaghy on the 23-03-2006 '[Ffmpeg-devel] dvr-ms seek help request')
...
Originally committed as revision 6054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 17:07:01 +00:00
Steve L'Homme
052aa2ad3c
value_num should also be 64bit (1 hunk from the asf seeking patch by DrDivx/Steve Lhomme)
...
Originally committed as revision 6053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 16:26:59 +00:00
Michael Niedermayer
7ad5455cd7
total_size should be 64bit (1 hunk of the asf seeking patch from DrDivx / Steve Lhomme)
...
Originally committed as revision 6052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 16:24:39 +00:00
Kohn Emil Dan
b6eaae39b4
The reader ignores the size of the ASF data object and keeps on
...
reading even beyond it.
Therefore if the ASF file includes an index object at its end, the
reader will treat the index like data, but of course will fail since
it thinks that the data is corrupted.
When reading an asf file with an index object, ffmpeg will
complain at the end of the file that it read an invalid header.
Patch by Kohn Emil Dan, < emild A cs P technion P ac P il >
Original thead:
Date: Apr 18, 2006 4:11 PM
Subject: [Ffmpeg-devel] Two ASF related bugs and fixes
Originally committed as revision 5857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-29 16:07:19 +00:00
Måns Rullgård
9d9f4119bd
move common stuff from avienc.c and wav.c to new file riff.c
...
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176
allow individual selection of muxers and demuxers
...
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9
give AVInput/OutputFormat structs consistent names
...
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Måns Rullgård
a5e9102b4b
free codec extradata in av_close_input_file
...
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-16 07:54:37 +00:00
Michael Niedermayer
38cf2a723c
timebase fix
...
Originally committed as revision 5099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 19:50:21 +00:00
Michael Niedermayer
30a43f2d09
add size to AVIndex
...
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 11:29:55 +00:00
Måns Rullgård
1bd8624697
kill some warnings
...
Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-25 22:41:31 +00:00
Alex Beregszaszi
6df84c3ad4
10l, fails to compile when debug enabled
...
Originally committed as revision 4998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 02:24:37 +00:00
Michael Niedermayer
88141c9192
audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<)
...
Originally committed as revision 4874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-20 23:48:16 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896
COSMETICS: tabs --> spaces, some prettyprinting
...
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00