generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,166 Commits 24 Branches 241 Tags 173 MiB
3c728ceec6
Commit Graph

300 Commits

Author SHA1 Message Date
Anton Khirnov
8978fedaee avio: introduce an AVIOContext.seekable field 
Use it instead of url_is_streamed and AVIOContext.is_streamed.
 2011-04-03 22:46:40 +02:00
Michael Niedermayer
a0350330cd Move flv format #defines to common header so they can be used by the encoder too. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 17:38:29 +02:00
Michael Niedermayer
0c4d4a9355 Cleanup flv keyframe index reading and add some saftey checks. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 13:34:32 +02:00
Michael Niedermayer
7ac167493e Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  mpegts: propagate avio EOF in read_packet()
  configure: Initial support for --target-os=symbian
  Fixed-point FFT and MDCT
  Include dependencies for test programs
  ac3enc: simplify sym_quant()
  flvdec: read index stored in the 'keyframes' tag.
  mov: Add support for zero-sized stsc runs.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-01 02:58:15 +02:00
Kharkov Alexander
cb7e2c1ca8 flvdec: read index stored in the 'keyframes' tag. 
'keyframes' metatag is not part of the standard, it is just
convention to use such kind of metatag information for indexing.
Structure is following, it allows to have it inconsistent:
keyframes:
 times (array):
  time0 (num)
  time1 (num)
  time2 (num)
 filepositions (array)
  position0 (num)
  position1 (num)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-03-31 07:31:58 +02:00
Michael Niedermayer
4fa0e24736 Merge remote-tracking branch 'newdev/master' 
* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-23 02:42:56 +01:00
Anton Khirnov
933e90a69a avio: make av_url_read_fseek/fpause internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-21 14:54:52 -04:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov
384c9c2fa7 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
Anton Khirnov
74b3f67c9c lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2)
 2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8)
 2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Anton Khirnov
e63a362857 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
b7effd4e83 avio: avio_ prefixes for get_* functions 
In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read

get_partial_buffer will be made private later

get_strz is left out becase I want to change it later to return
something useful.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd)
 2011-02-20 19:05:47 +01:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
 2011-01-30 03:41:48 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Diego Elio Pettenò
66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
 2011-01-26 22:10:09 +00:00
Thierry Foucu
caa7ad5dc6 Fix 16kHz Mono NellyMoser in flv. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 25667 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-03 20:12:07 +00:00
Baptiste Coudurier
7d6096e42e Use ext sample from mpeg4audio config if set with AAC SBR 
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-01 22:31:31 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2() 
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 14:27:42 +00:00
Howard Chu
fc8fa007fb Implement librtmp seek support. 
Implement flv_read_seek(), add a missing check on stream_index
and fix timestamp rounding in rtmp_read_seek().

Also add the flv_read_seek2() function, which is not enabled but is
useful as reference.
To actually implement flv_read_seek2() correctly, there would need to
be some corresponding av_url_read_fseek2() function to propagate the
timestamps down to the ByteIOContext and URLContext.

Patch by Howard Chu <hyc <at> highlandsun.com>.

See the thread:
Subject: [FFmpeg-devel] RTMP seek support
Date: 2010-03-28 23:35:02 GMT

Originally committed as revision 22904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-18 19:09:25 +00:00
Howard Chu
7e939205d9 Set audio bit rate. 
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-11 12:21:30 +00:00
Howard Chu
527c2e6429 Fix flvdec start-of-frame. 
Patch by Howard Chu hyc highlandsun com

Originally committed as revision 22757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-01 08:02:20 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Baptiste Coudurier
fdf4662211 fetch flv duration from file if it is set to 0 in metadata 
Originally committed as revision 21329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-19 19:41:24 +00:00
Michael Niedermayer
cc38e063be Revert flvdec.c part of r20836 
Log:
	Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
	arrays of fixed length.
	Code from ffmbc with changes to adapt to our metadata API.
Reason: memleak & fix is not trivial

Originally committed as revision 20866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 15:59:19 +00:00
Daniel Verkamp
8e9efe4392 FLV 8-bit PCM is unsigned, not signed 
Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 03:30:25 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped 
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-13 20:27:29 +00:00
Daniel Verkamp
0aa6a518ad Add codec id for Flash screen codec v2 and hook it up in FLV demuxer 
Originally committed as revision 20563 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-20 19:16:42 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig. 
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-11 20:24:23 +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
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
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
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
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
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
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
Michael Niedermayer
4eec260642 Remove unused variable from flv_read_metabody() found by CSA. 
Originally committed as revision 18571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 17:42:41 +00:00
Michael Niedermayer
77daaf6748 Disable metadata reading. Yes, I would like to know what this code is good for 
and this is the easiest way to. It would be a lot of messy code we can drop
if it is useless.
As a sideeffect this fixes issue977.

Originally committed as revision 18460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 04:01:03 +00:00
Michael Niedermayer
634b927f82 Do not fail on zero packets. 
Originally committed as revision 18328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-03 15:32:31 +00:00
Baptiste Coudurier
fcb4228c86 skip empty data packets in flv, fix input.flv 
Originally committed as revision 18306 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 03:52:19 +00:00
Michael Niedermayer
ded0149948 Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer 
and the EAGAIN were just added as example not because they made sense.

Originally committed as revision 17783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 20:24:17 +00:00
Baptiste Coudurier
d2718187b9 parse aac extradata to fetch channels and sample rate, patch from Netgem 
Originally committed as revision 17506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 23:54:50 +00:00
Peter Ross
0e9602ef93 FLV demuxer: return AVERROR_EOF upon detection of end of file. 
Originally committed as revision 17457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 12:19:55 +00:00
Benoit Fouet
c102347088 Add a context to av_log() calls. 
Originally committed as revision 17375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-16 16:09:34 +00:00
Stefan de Konink
9a354fe3f9 Implement the reading of the video bitrate of flv movies out of the meta data, 
to have the total bitrate available in the avformat structures.
Patch by Stefan de Konink  stefan konink de

Originally committed as revision 16943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 16:05:50 +00:00
Michael Niedermayer
a308737bd6 Use EAGAIN return, primarely intended as example of EAGAIN useage. 
Originally committed as revision 16719 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 12:08:06 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Michael Niedermayer
2f3d7ea974 Fix detection of audio codec in K70707-ARIA229.flv. 
Fixes issue760.

Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 20:56:30 +00:00
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