1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

161 Commits

Author SHA1 Message Date
Ronald S. Bultje
f27544fd5b Separate the packet fetching from the data reading, so that the data reading
function is assured to parse at most one packet. This makes this function
useful for ASF data packet parsing in a "push-mode" in addition to the
current "pull-mode", and therefore allows for use of these functions in,
for example, the RTSP demuxer (for MS-RTSP support). Tested to give identical
output before and after for regular ASF playback, also see discussion in the
ML thread "[PATCH] asf.c: move packet_time_start=0 statement". Testsuite also
works after the patch, tested by Benoit Fouet.

Originally committed as revision 16108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 17:18:11 +00:00
Ronald S. Bultje
dc50773dc5 Remove static variable and a printf using it. See "[PATCH] asf.c: move
packet_time_start=0 statement" thread on ML.

Originally committed as revision 16025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06 20:28:38 +00:00
Ronald S. Bultje
022f0b7c01 Do not access s->gb directly in functions that have a local copy of that
variable. See "[PATCH] asf.c: don't access AVFormatContext->pb" thread on
ML.

Originally committed as revision 16023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06 18:35:52 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords.
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 15:23:30 +00:00
Baptiste Coudurier
eb63b051c0 timestamp is dts in wmv/asf
Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 03:45:31 +00:00
Diego Pettenò
fb65d2ca84 Use enum typers instead of int.
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +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
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Måns Rullgård
f94981ea6a ASF: use dprintf(), allow compilation with -DDEBUG
Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:07 +00:00
Michael Niedermayer
0bef08e516 New codec probing system try #1.
Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:42:00 +00:00
Michael Niedermayer
3e86dba24b command_streams are type data not unknown.
Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 16:43:46 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:22:56 +00:00
Baptiste Coudurier
ccafd47251 factorize read_header failure freeing code
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:16:56 +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
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Rafaël Carré
b4bbcd635f Read asf file header fields in the right order
Patch by Rafaël Carré ( funman videolan org )

Originally committed as revision 12926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 20:08:39 +00:00
Michael Niedermayer
11c55efa34 Skip over unknown extended_content_header tags.
fixes issue358

Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:26:48 +00:00
Michael Niedermayer
16428e6348 simplify
Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:20:49 +00:00
Reimar Döffinger
7abe438045 Remove ff_mms_set_stream_selection again from asf demuxer,
it does not seem like a good solution to the problem and will
cause dependency problems if a libavprotocols should be split out.

Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 11:18:53 +00:00
Reimar Döffinger
4d65da424a Put is_mms under ifdef CONFIG_MMSH_PROTOCOL, avoids warning:
libavformat/asf.c:112: warning: 'is_mms' defined but not used

Originally committed as revision 11815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 21:17:46 +00:00
Baptiste Coudurier
3dc761a443 typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
Originally committed as revision 11681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:22:25 +00:00
Reimar Döffinger
efc90ebfcb begining -> beginning typo fix
Originally committed as revision 11309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-23 18:08:00 +00:00
Aurelien Jacobs
cd31f8dc23 cosmetics: indentation
Originally committed as revision 11279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 00:26:53 +00:00
Aurelien Jacobs
fd2982a0a0 remove double check of pb->read_seek
Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 00:25:18 +00:00
Björn Axelsson
fa13095a5d Enable av_read_pause(), av_read_play() and the ASF demuxer's av_read_seek()
to use the protocol-native functionality if available.
Patch by Björn Axelsson: bjorn point axelsson at intinor dot se
Original thread: [FFmpeg-devel] [PATCH][4/4] Enable use of the extended API
Date: Thu Nov 22 16:01:06 CET 2007

Originally committed as revision 11248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-17 09:28:46 +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
Patrice Bensoussan
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
Björn Axelsson
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
Reimar Döffinger
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
Diego Biurrun
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
Ramiro Polla
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
Patrice Bensoussan
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
Michael Niedermayer
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
Björn Axelsson
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
Michael Niedermayer
b43387d447 more verbose error
Originally committed as revision 9964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-06 20:37:45 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
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
Patrice Bensoussan
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
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Zuxy Meng
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
Zuxy Meng
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
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
John Donaghy
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
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
Michael Niedermayer
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
Baptiste Coudurier
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
Zuxy Meng
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
Michael Niedermayer
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
Michael Niedermayer
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