0d4e281cac
Add support for reading WM/Year tag
...
Patch by: patrice bensoussan a free d fr
Originally committed as revision 11010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 07:31:25 +00:00
49ce700a27
Allow propagation of stream selection through the ASF demuxer to the
...
MMSH protocol handler.
Patch by Björn Axelsson: bjorn ; axelsson § intinor : se
Original thread:
[FFmpeg-devel] [PATCH] MMSH stream selection support for asf demuxer
Date: 11/02/2007 11:51 AM
Originally committed as revision 10935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-06 16:19:09 +00:00
72be7db423
Add support for decrypting asf files
...
Originally committed as revision 10821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-20 14:25:02 +00:00
5d25d2a983
cosmetics: Move asf_read_close() down to get rid of a forward declaration.
...
Originally committed as revision 10735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 17:44:38 +00:00
29a7b8ef27
Fix memleak
...
Closes issue 102
Originally committed as revision 10719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-12 23:25:48 +00:00
6ec14b333d
Improve track number decoding for some WMA files
...
patch by Patrice Bensoussan %patrice P bensoussan A free P fr%
Original thread:
Date: Sep 9, 2007 12:33 PM
Subject: [FFmpeg-devel] [PATCH] Improve track number decoding for some WMA files
Originally committed as revision 10462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-09 17:54:26 +00:00
da0b94f539
workaround ms (lack of) intelligence in their design of dvr-ms
...
yes kids you do not make 90% of your file contain empty dummy packets
closes issue76
Originally committed as revision 10280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-02 15:58:43 +00:00
a9054d91b7
store asf streaming bitrates consistently
...
patch by Björn Axelsson: [bjorn axelsson intinor se]
Originally committed as revision 10130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-17 06:49:43 +00:00
b43387d447
more verbose error
...
Originally committed as revision 9964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-06 20:37:45 +00:00
371bf80642
ignore preroll, it is generally not what AVStream.start_time should contain
...
Originally committed as revision 9963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-06 20:36:55 +00:00
60ff1c4481
ignore invalid packet_obj_size
...
fixes video5.asf
Originally committed as revision 9807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-27 00:29:33 +00:00
6f3e0b2174
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
...
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
629272d86f
Add support for track numbers when they are set via strings
...
patch by Patrice Bensoussan: patrice bensoussan free fr
Originally committed as revision 9318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-15 09:10:19 +00:00
755bfeabcc
misc spelling fixes
...
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
18d915dda6
cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
...
Originally committed as revision 8917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 12:04:17 +00:00
d84707377f
use asf stream information to set bitrate
...
patch by Zuxy Meng zuxy dot meng chez gmail tod com
reference thread: [Ffmpeg-devel] Third Try: Set bit_rate for asf format
Originally committed as revision 8861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-30 15:56:11 +00:00
57004ff1d7
add an enum for need_parsing
...
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
6fea687ec1
DVR-MS probe audio format
...
patch by John Donaghy \ johnfdonaghy chez gmail dot com /
Original thread:
date: 03/13/2007 04:56 PM
subject: [Ffmpeg-devel] [PATCH] DVR-MS probe audio format - was DVR-MS bug (MP2 decoding)
Originally committed as revision 8715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 08:11:33 +00:00
87e8788680
allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
...
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:34:15 +00:00
0c0d17f3ce
fix demuxing of IMAG0002.ASF
...
Originally committed as revision 8558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 16:20:40 +00:00
0b339acb9e
revert r8538 (set bit rate for asf format) until regression tests issue is stated
...
Originally committed as revision 8539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 14:48:42 +00:00
4d38ebfd7b
set bit rate for asf format, patch by Zuxy Meng, zuxy meng gmail com
...
Originally committed as revision 8538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 12:03:37 +00:00
09d9672ad6
fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
...
Originally committed as revision 8320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 03:36:17 +00:00
b9c6d01b6f
off by one error
...
Originally committed as revision 8236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 01:19:36 +00:00
0e3b6a6f55
Add the stream_bitrate GUID to the asf parsing code, and set stream bitrate
...
properties accordingly.
Patch by Ryan Martell, rdm4 % martellventures com.
Originally committed as revision 8046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-20 23:44:11 +00:00
559a55ad52
use dvr-ms timestamps
...
Originally committed as revision 7905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-10 03:36:12 +00:00
a836a2c8b2
Set correct aspect ratio (it's sample aspect, not display aspect)
...
Patch by Zuxy Meng
(mail = `echo "Zuxy Meng" | tr "[A-Z] " "[a-z]." | sed "s/$/@gmail.com/"`)
Originally committed as revision 7806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-02 14:33:25 +00:00
30e88789c9
extract aspect ratio
...
Originally committed as revision 7791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-31 23:32:01 +00:00
f8f0a0bdfd
fix seeking in wma
...
Originally committed as revision 7759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-29 14:54:55 +00:00
de3ae9596b
stealing a few field names from mplayers asf demuxer
...
Originally committed as revision 7725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-27 12:07:16 +00:00
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
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
92216453db
better padsize check
...
Originally committed as revision 7656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:33:26 +00:00
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
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
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
1ae7518dda
inden(ta)tion
...
Originally committed as revision 7652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:06:46 +00:00
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
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
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
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
5e2a485507
10l
...
Originally committed as revision 7647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:33:10 +00:00
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
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
916bb12c90
simplify
...
Originally committed as revision 7643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:01:27 +00:00
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
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
b83e83b915
cosmetic
...
Originally committed as revision 7639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:21:16 +00:00
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
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
b586d9eac3
useless &0x80
...
Originally committed as revision 7631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:46:14 +00:00
fe468b331a
remove sensless casts
...
Originally committed as revision 7612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:15:55 +00:00
24c14d6d01
simplify GUIDs
...
Originally committed as revision 7611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:06:19 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
38cf2a723c
timebase fix
...
Originally committed as revision 5099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 19:50:21 +00:00
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
1bd8624697
kill some warnings
...
Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-25 22:41:31 +00:00
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
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
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
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
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
4733abcbf3
use PRIxN, %zd, %td formats where needed
...
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
fa379405bb
Fix asf header decoding issue, patch by < patrice -- bensoussan AH gmail -- com >
...
http://avifile.sourceforge.net/asf-1.0.htm has more info about asf headers
Original thread:
Date: Oct 22, 2005 11:44 PM
Subject: [Ffmpeg-devel] [PATCH] Fix asf header decoding issue
Originally committed as revision 4663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-26 12:15:09 +00:00
a9e3509529
Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
...
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.
Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-23 00:25:41 +00:00
ae38261ee8
changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)
...
Originally committed as revision 4501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-10 23:41:20 +00:00
47627aec61
round pointer up to next packet_size multiple
...
Originally committed as revision 4479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-27 07:31:40 +00:00
01f4895c68
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
...
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
724dc20cf9
typo
...
Originally committed as revision 4387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-23 00:12:36 +00:00
2692067a45
AVPacket.pos
...
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
c0df9d75bd
switch to native time bases
...
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
160d679c07
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
...
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-24 17:21:11 +00:00
0ffd77b96b
fixing demuxing of DV5700.asf
...
Originally committed as revision 4138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-19 00:35:08 +00:00
f3356e9c9e
more fine grained discarding of packets
...
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-17 01:25:01 +00:00
b9866ebcc7
support discarding uninterresting packets
...
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-22 13:36:02 +00:00
0ecca7a49f
various security fixes and precautionary checks
...
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
6c55fd7968
preroll is in ms
...
pts should start at start_time
Originally committed as revision 3771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-22 03:04:21 +00:00
6260de6ab0
fix regression test failure
...
Originally committed as revision 3767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-21 02:01:32 +00:00
3129cd0140
allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
...
Originally committed as revision 3679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-13 01:27:35 +00:00
afbb5ce406
dvr-ms video decoding support
...
Originally committed as revision 3631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 13:07:59 +00:00
3ba1438dec
use native timebase for seeking
...
direction flag for seeking
Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-10 22:05:43 +00:00
0bd586c50d
sweeping change from -EIO -> AVERROR_IO
...
Originally committed as revision 3239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-19 03:59:34 +00:00
Patrice Bensoussan
Björn Axelsson
Reimar Döffinger
Diego Biurrun
Ramiro Polla
Michael Niedermayer
Panagiotis Issaris
Zuxy Meng
Aurelien Jacobs
John Donaghy
Baptiste Coudurier
Ryan Martell
Steve L'Homme
Dominik Mierzejewski
Måns Rullgård
Kohn Emil Dan
Alex Beregszaszi
Mike Brown
Mike Melanson