1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

147 Commits

Author SHA1 Message Date
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
Ryan Martell
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
Michael Niedermayer
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
Zuxy Meng
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
Michael Niedermayer
30e88789c9 extract aspect ratio
Originally committed as revision 7791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-31 23:32:01 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
92216453db better padsize check
Originally committed as revision 7656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:33:26 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
1ae7518dda inden(ta)tion
Originally committed as revision 7652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:06:46 +00:00
Michael Niedermayer
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