Commit Graph

138 Commits

Author SHA1 Message Date
Baptiste Coudurier ebd610557e set pts in flv demuxer
Originally committed as revision 15841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 02:56:34 +00:00
Andrew Wason 8ff8de73a4 Fix endless loop when opening corrupt FLV files (issue 699).
Patch by Andrew Wason, rectalogic A rectalogic D com

Originally committed as revision 15738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 23:49:04 +00:00
Baptiste Coudurier 7f8cd075e0 simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 23:06:03 +00:00
Baptiste Coudurier f96d0eef53 force sample rate to 16khz for speex in flv, fix speexaudio.flv
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 18:36:26 +00:00
Pascal Massimino 4fe8a45240 fix for >2GB flv files
Originally committed as revision 15677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 16:46:43 +00:00
Alexander Wichers 88cb61bb0c 8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:08:55 +00:00
Luca Abeni dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Baptiste Coudurier ae58b54b3f skip empty flv data packets, fix issue #602
Originally committed as revision 15042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:10:34 +00:00
Baptiste Coudurier 3d9aecb0d7 factorize packet skip code
Originally committed as revision 15041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:07:01 +00:00
Baptiste Coudurier 6298eb810d simplify size handling code
Originally committed as revision 15040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:03:18 +00:00
Baptiste Coudurier 77b0443544 speex in flv demuxing
Originally committed as revision 15028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:06:35 +00:00
Baptiste Coudurier 22e7d9cc25 skip flv video info / command frame packets, fix issue #546
Originally committed as revision 14480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 02:26:40 +00:00
Stefano Sabatini bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Baptiste Coudurier 04fd3e8134 aac and h264 in flv demuxing
Originally committed as revision 13439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:01:41 +00:00
Baptiste Coudurier 7ef94d221b in flv this field is dts finally
Originally committed as revision 13268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:51:33 +00:00
Baptiste Coudurier 19719bc631 flv use 32 bit pts
Originally committed as revision 13267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:47:30 +00:00
Baptiste Coudurier 07a47ae2a3 pts are unsigned according to specs, fix negative pts when 32bit pts are used
Originally committed as revision 12949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:08:13 +00:00
Michael Niedermayer 780169c363 Remove useless code.
Originally committed as revision 12814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:25:44 +00:00
Michael Niedermayer b41497e903 Recommit r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
After seeking bug has been fixed.

Originally committed as revision 12813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:24:29 +00:00
Michael Niedermayer 0366654e2b Use generic seeking code for flv. The removed code was a buggy duplicate.
Originally committed as revision 12812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:22:23 +00:00
Michael Niedermayer 26d95a1ecf revert r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
As it unexpectly breaks seek regression tests.

Originally committed as revision 12811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:10:53 +00:00
Michael Niedermayer a33cfa3071 Stop find_stream_info() searching for further streams if 2 streams have
been found.

Originally committed as revision 12810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 23:47:03 +00:00
Michael Niedermayer 749c9201aa 10l
Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
fixes WELCOMETOBELGRADE.flv

Originally committed as revision 12809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 22:58:04 +00:00
Pascal Massimino c04c52d3a8 Additional checks for strange num_val in FLV metadata
Avoids some "Unsupported audio codec (6)" message in FLVs, e.g.
        Example of such problematic bitstream is 'bad_codec6.flv'
        in ftp's /incoming directory.

Originally committed as revision 12510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 11:02:40 +00:00
Michael Niedermayer 58293e57e1 Fix issue357
Do what the spec says, insane or not:
"
Format 0 (uncompressed) and Format 3 (uncompressed little-endian) are similar. Both encode
uncompressed audio samples. For 8-bit samples, the two formats are identical. For 16-bit
samples, the two formats differ in byte ordering. In Format 0, 16-bit samples are encoded and
decoded according to the native byte ordering of the platform on which the encoder and Flash
Player, respectively, are running. In Format 3, 16-bit samples are always encoded in little-endian
order (least significant byte first), and are byte-swapped if necessary in Flash Player before
playback. Format 0 is clearly disadvantageous because it introduces a playback platform
dependency. For 16-bit samples, Format 3 is highly preferable to Format 0 for SWF version 4
or later.
"

Originally committed as revision 12184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 01:04:00 +00:00
Michael Niedermayer 44de39f93c flv/swf do not have a big endian codec id, they only support
little endian and native endian.

Originally committed as revision 12183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 00:57:15 +00:00
Benjamin Larsson 107b5f93dd Reindent
Originally committed as revision 11285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 11:22:39 +00:00
Benjamin Larsson 7b76c22465 Correctly handle FLV_CODECID_NELLYMOSER_8HZ_MONO files
Originally committed as revision 11284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 11:21:10 +00:00
Björn Axelsson 899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Alex Beregszaszi 018b6fb465 Honor the 8bit extension (now 32bit instaed 24bit) of the pts field introduced in FLV specification v9.
Originally committed as revision 11043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-16 00:09:34 +00:00
Michael Niedermayer c8652b5714 support flv with invalid header
fixes issue43

Originally committed as revision 10887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-31 22:10:34 +00:00
Michael Niedermayer 6f910bcf39 factorize stream creation
Originally committed as revision 10886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-31 21:35:50 +00:00
Benjamin Larsson 636b13c5fc Nellymoser ASAO decoder
Originally committed as revision 10741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 16:26:02 +00:00
Aurelien Jacobs 9990460353 use the VP6A codec
Originally committed as revision 10578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-25 19:30:03 +00:00
Aurelien Jacobs df63f130c8 revert r10527
There is now a proper vp6a codec, so no need for this hack anymore.

Originally committed as revision 10577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-25 19:25:59 +00:00
Aurelien Jacobs f84c357325 Add support for VP6A in flv.
Those files really contain 2 standard VP6 video streams:
 - the "normal" video stream
 - the alpha plan video stream (which is a standard
   YV12 video with it's U an V plans all set to 0)
closes issue166

Originally committed as revision 10527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-18 15:36:29 +00:00
Panagiotis Issaris 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
Panagiotis Issaris 769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:21:30 +00:00
Diego Biurrun 7b94177e37 Group all copyright and author notices together.
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:37:29 +00:00
Aurelien Jacobs 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
Michael Niedermayer 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
Alex Beregszaszi 031311cbd1 workaround for broken flvtoolized files
Originally committed as revision 8277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-07 01:52:08 +00:00
Michael Niedermayer 683ab79ca0 flv follows in movs footsteps and has random trash in the width/height fields
Originally committed as revision 7668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 15:38:07 +00:00
Michael Niedermayer 742482290f improve probe and give it the max score
Originally committed as revision 7667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 15:23:41 +00:00
Allan Hsu 428cc588f2 add FLV decoder metadata parsing
patch by Allan Hsu % allan A counterpop P net %
date: Dec 12, 2006 12:19 PM
subject: Re: [Ffmpeg-devel] [PATCH] FLV decoder metadata reading

Originally committed as revision 7286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 12:29:33 +00:00
Michael Niedermayer 15f14fc7c2 move duration finding code into read_packet() so it can be skiped if duration has already been set
Originally committed as revision 7272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:53:01 +00:00
Michael Niedermayer 17fcb1709f use amf_get_string()
Originally committed as revision 7271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:38:16 +00:00
Michael Niedermayer 759dd138df cosmetics
Originally committed as revision 7270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:32:05 +00:00
Michael Niedermayer 896bcd2e85 amf_get_string() by Allan Hsu allan aat counterpop doot net
Originally committed as revision 7269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:31:17 +00:00
Michael Niedermayer 4eb0c66505 get rid of AVFMTCTX_NOHEADER, create streams in read_header()
Originally committed as revision 7268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:25:30 +00:00
Allan Hsu 6cac3a3b08 Defines various common FLV format values between the FLV muxer and demuxer
in a common flv.h.
patch by Allan Hsu  allan _at_ counterpop.net

Originally committed as revision 7231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 00:23:04 +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
Aurelien Jacobs ec996a6303 fix flvdec.c file description comment
Originally committed as revision 6773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 00:13:02 +00:00
Aurelien Jacobs 246f86a4d6 document the extradata protocol for VP6F
Originally committed as revision 6772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 00:10:18 +00:00
Aurelien Jacobs 9e2424ce60 use the adjustment value present in FLV to crop VP6 video
Originally committed as revision 6770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 23:19:42 +00:00
Roberto Togni 12b6992b6f flv files from myspace with mp3 audio require need_parsing because the
frames are fragmented.

Originally committed as revision 6686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-13 18:21:28 +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
Nazo aeb20f7f9d FLV seeking patch by Nazo. lovesyao at aol com.
Originally committed as revision 6285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-17 09:39:49 +00:00
Aurelien Jacobs 5ce117c37c VP5 and VP6 video decoder
Originally committed as revision 6213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-09 17:19:37 +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
Benjamin Larsson 0919e788ae Flash Screen Video decoder (fourcc:FSV1)
Originally committed as revision 5436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 07:31:59 +00:00
Michael Niedermayer dbdaebe28d extract duration
Originally committed as revision 5171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-16 17:04:31 +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
Michael Niedermayer a254c5745b kill duplicated get/put_be24()
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:41:08 +00:00
Michael Niedermayer dd9f59160e extract duration if available
Originally committed as revision 4459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:26:41 +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 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
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
Alex Beregszaszi 2f5132e7a8 proper handling of samplesize
Originally committed as revision 3980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25 11:15:12 +00:00
Måns Rullgård 88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Alex Beregszaszi ae26a016b4 support adpcm audio, also some more verbose messages
Originally committed as revision 3970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-21 19:28:32 +00:00
Alex Beregszaszi 923bd441fe correct pcm in flv handling
Originally committed as revision 3968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-21 18:05:21 +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 15bc38e57c try to guess the fps if they are variable
Originally committed as revision 3760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-19 01:23:22 +00:00
Alex Beregszaszi d08f4bcbbd report keyframes
Originally committed as revision 3608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-18 11:42:40 +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 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 068f2a22db cleanup
fix streamcopy

Originally committed as revision 3026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-17 12:04:59 +00:00
Michael Niedermayer bb01a3f021 guess framerate
Originally committed as revision 2866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-10 03:45:14 +00:00
Michael Niedermayer 92a267756f flv fixes
Originally committed as revision 2863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-09 20:14:34 +00:00
Michael Niedermayer 6ed08157ca channel count & samplerate fix
Originally committed as revision 2858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-08 02:38:43 +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
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
Garrick Meeker d4f5d74a54 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-09 23:10:59 +00:00