Commit Graph

182 Commits

Author SHA1 Message Date
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
Måns Rullgård
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
Patrice Bensoussan
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
Diego Biurrun
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
Mike Brown
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
724dc20cf9 typo
Originally committed as revision 4387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-23 00:12:36 +00:00
Michael Niedermayer
2692067a45 AVPacket.pos
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
Michael Niedermayer
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
Mike Melanson
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Mike Melanson
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
Michael Niedermayer
cdd5034f89 store index for seeking in the native timebase of each stream
set correct timebase for nut
merge mpeg-ts seeking with existing seeking code
10l fix in mpegts (27mhz vs. 90khz)

Originally committed as revision 3152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 16:26:12 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
8d14a25c3e moving nearly identical binary search code from nut/mpeg/asf to utils.c
Originally committed as revision 3003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 16:50:03 +00:00
Konstantin Andreyev
615b92fd8e asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
1. Corrected packet sent time. (Packet sent time => previous packet sent
     time)
  2. Corrected payload playing time. (Payload playing time => packet sent
     time)
  3. Used different format for packets with one payload and multi payloads.

Originally committed as revision 2851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-05 22:10:50 +00:00
Konstantin Andreyev
542993b06e split asf patch by (Konstantin Andreyev <kandreyev at bcsii dot com>)
Originally committed as revision 2850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-05 21:34:30 +00:00
Michel Bardiaux
bc874daea8 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-03 15:41:21 +00:00
Michael Niedermayer
0888ac4f27 seeking stuff
adaptively change middle position selection algo for seeking, this avoids some ugly worstcases of the interpolated variant
  avoid backward search for mpeg where possible, its 17 times slower then forward according to my benchmark

Originally committed as revision 2710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-17 20:26:44 +00:00
Michael Niedermayer
3e9245a98e store searched distance in index, so we dont waste time searching for keyframes where we already searched
asf seek fixes & use keyframe pos/timestamp cache

Originally committed as revision 2709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-17 18:06:52 +00:00
Michael Niedermayer
29962fea47 header parser fix
Originally committed as revision 2707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 21:50:05 +00:00
Michael Niedermayer
1305a9d55e replic_size==0 fix, needed so that G.726 asf file, so ffmpeg can at least decode the video without segfaulting
Originally committed as revision 2706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 21:27:59 +00:00
Michael Niedermayer
09646bab63 use packet number instead of byte number internally for seeking
Originally committed as revision 2704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 18:40:29 +00:00
Michael Niedermayer
a602556e06 unused
Originally committed as revision 2703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 18:32:49 +00:00
Michael Niedermayer
82b9e4a286 seeking fixes
memleaks
  infinite loops
  uninitalized variables
with some luck u can seek now a few times before it dies

Originally committed as revision 2702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 18:18:47 +00:00
Michael Niedermayer
580fb5e72c memleak fix
multiple stream seeking (yes i know seeking is still broken)
related cleanup

Originally committed as revision 2701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 14:45:53 +00:00
Kevin Kuphal
38376f00fd seeking in single stream asf patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
Originally committed as revision 2700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-14 13:32:49 +00:00
Kevin Kuphal
d13431cd56 ASF extended header parsing patch by ("Kevin Kuphal" <kevin dot kuphal at sitecity dot net>)
Originally committed as revision 2672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-06 15:31:36 +00:00
Fabrice Bellard
afda223c6b frame rate should be completely disabled in asf (closer now) - disabled seek
Originally committed as revision 2503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 18:49:58 +00:00
Roman Shaposhnik
19d053c5ba * fixes for broken builds on Solaris, OS2 and all bingendian
systems out there.

Originally committed as revision 2480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-04 19:35:43 +00:00
Roberto Togni
5e29abf8b7 Make avi and asf demuxer export palette in palctrl
Originally committed as revision 2465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-02 21:55:38 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:15:53 +00:00
Fabrice Bellard
490579042a 64 bit pts for writing - more const usage
Originally committed as revision 2255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:37:33 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:04:29 +00:00
Michael Niedermayer
bd5a60201e use codec_tag for encoding too
Originally committed as revision 2125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-18 09:20:02 +00:00
Fabrice Bellard
247eadca9d update duration and start_time - add av_new_stream() usage
Originally committed as revision 2110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:52:53 +00:00
Falk Hüffner
4cfbf61bf1 Warning and compatibility fixes.
Originally committed as revision 1902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-24 18:48:30 +00:00
Zdenek Kabelac
693feac556 * filling bitdepth
Originally committed as revision 1811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-22 08:32:33 +00:00
Michael Niedermayer
14bea432f1 per context frame_rate_base, this should finally fix frame_rate related av sync issues
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 15:16:19 +00:00
Roman Shaposhnik
2e7973bbe7 correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
Originally committed as revision 1664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 01:35:47 +00:00
Michael Niedermayer
7004ffb3d7 merging fourcc with codec_tag
Originally committed as revision 1645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-08 01:40:52 +00:00
François Revol
5082f759e0 prettier debug output
Originally committed as revision 1607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-25 13:12:41 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Ryutaroh Matsumoto
c6c11cb6c6 mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)
Originally committed as revision 1352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-20 23:10:58 +00:00
Michael Niedermayer
492cd3a920 AVVideoFrame -> AVFrame
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-09 12:03:43 +00:00
Michael Niedermayer
1e491e29c2 cleanup
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 10:04:03 +00:00
Fabrice Bellard
abac617591 renamed libav to libavformat
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 19:07:40 +00:00