Statistics
| Branch: | Revision:

ffmpeg / libavformat / asf.c @ 4dcde00c

History | View | Annotate | Download (6.05 KB)

# Date Author Comment
2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

45430099 01/31/2011 01:58 PM Ronald S. Bultje

asf/wtv: use service_provider and service_name metadata tags

Signed-off-by: Ronald S. Bultje <>

dccbd97d 01/21/2011 08:21 PM Anton Khirnov

lavf: move ff_put_str16_nolen from asf to avio and rename it

It will be useful in the mp3 muxer.

Signed-off-by: Mans Rullgard <>

7428c8f5 07/20/2010 11:50 AM Martin Storsjö

asf: Add asf_jfif_media guid

Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk

8166c498 03/31/2010 09:22 AM Anton Khirnov

Remove superfluous space from a conversion table.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 22741 to svn://svn.ffmpeg.org/ffmpeg/trunk

852e0ca5 03/24/2010 06:40 PM Zhentan Feng

Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier
to share it with e.g. MMS.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 22656 to svn://svn.ffmpeg.org/ffmpeg/trunk

88b51ea9 03/08/2010 01:13 PM Vladimir Pantelic

Use ASF supports "markers" which are a name and a time stamp to create
lavf chapters.
Patch by Vladimir Pantelic pan (arobase) nt tu (dash) darmstadt de

Originally committed as revision 22326 to svn://svn.ffmpeg.org/ffmpeg/trunk

a5517dcc 02/25/2010 09:10 AM Benoit Fouet

asf: indent.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk

9b54f432 02/25/2010 09:09 AM Benoit Fouet

asf: add more entries to metadata conv table.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk

a106d411 02/24/2010 06:17 PM Anton Khirnov

Don't add WM prefixes to all written ASF tags.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca76a119 02/01/2010 11:39 AM Anton Khirnov

Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk

febd1c90 10/11/2009 11:09 PM Daniel G. Taylor

Detect Windows Media DRM protected files and display warning if no key
was provided.

Patch by Daniel G. Taylor, dan programmer-art org

Originally committed as revision 20209 to svn://svn.ffmpeg.org/ffmpeg/trunk

5f1ac36d 05/12/2009 12:35 PM Cyril Comparon

Per-stream language-tags extraction in asfdec.
Patch by Cyril Comparon: gmail(name, surname);
Original thread: Suggestion for a centralized language-tag facility in libavformat
Date: 04/10/2009 07:33 PM

Originally committed as revision 18800 to svn://svn.ffmpeg.org/ffmpeg/trunk

b8b00d94 03/18/2009 02:03 PM Reimar Döffinger

Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
(GUID is also defined, but differently, in Windows headers).

Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk

719e721a 03/01/2009 12:12 AM Aurelien Jacobs

Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk

17af0525 02/26/2009 04:17 PM Aurelien Jacobs

move static tables from asf.h to non-static tables in asf.c
this avoid getting those tables duplicated in asfenc.o and asfdec.o

Originally committed as revision 17619 to svn://svn.ffmpeg.org/ffmpeg/trunk

5e293c42 02/26/2009 03:44 PM Aurelien Jacobs

rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistency

Originally committed as revision 17618 to svn://svn.ffmpeg.org/ffmpeg/trunk

e9259f8d 02/19/2009 11:24 PM Alex Converse

Re-indent after last commit

Originally committed as revision 17467 to svn://svn.ffmpeg.org/ffmpeg/trunk

e7f73adb 02/19/2009 11:23 PM Alex Converse

AAC in ASF does not need parsing.

Originally committed as revision 17466 to svn://svn.ffmpeg.org/ffmpeg/trunk

871e62e5 02/16/2009 04:09 PM Benoit Fouet

Add a context to av_log() calls.

Originally committed as revision 17374 to svn://svn.ffmpeg.org/ffmpeg/trunk

20e2a7ae 02/03/2009 10:12 PM Aurelien Jacobs

use new metadata API in asf demuxer

Originally committed as revision 16977 to svn://svn.ffmpeg.org/ffmpeg/trunk

406792e7 01/19/2009 03:46 PM Diego Biurrun

cosmetics: Remove pointless period after copyright statement non-sentences.

Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk

b0d75d60 01/07/2009 02:50 PM Ronald S. Bultje

Don't use s->pb if a local ByteIOContext was already provided by the calling
function. See mailinglist thread "[PATCH] RTSP-MS 1/15: don't use s->pb in
asf.c".

Originally committed as revision 16470 to svn://svn.ffmpeg.org/ffmpeg/trunk

1d217cdb 12/18/2008 01:28 AM Ronald S. Bultje

Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
give them a ff_ prefix. See "[PATCH] asf.c: make functions of interest for
MS-RTSP public" thread on ML.

Originally committed as revision 16205 to svn://svn.ffmpeg.org/ffmpeg/trunk

d7fb5a18 12/18/2008 01:25 AM Ronald S. Bultje

Add a ByteIOContext argument to ASF functions that will be shared with the
RTSP stack for RTSP-MS support. This way, they can read input from any given
input source. See discussion in "[PATCH] add gb argument to ASF functions of
interest to MS-RTSP" ML thread....

f27544fd 12/13/2008 05:18 PM Ronald S. Bultje

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,...

dc50773d 12/06/2008 08:28 PM Ronald S. Bultje

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

022f0b7c 12/06/2008 06:35 PM Ronald S. Bultje

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

9686df2b 12/03/2008 03:23 PM Diego Biurrun

Delete unnecessary 'extern' keywords.

Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk

eb63b051 11/14/2008 03:45 AM Baptiste Coudurier

timestamp is dts in wmv/asf

Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk

fb65d2ca 10/02/2008 04:03 PM Diego Pettenò

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

dd1c8f3e 09/08/2008 02:24 PM Luca Abeni

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...

59729451 08/23/2008 11:43 PM Aurelien Jacobs

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

f94981ea 07/13/2008 07:41 PM Måns Rullgård

ASF: use dprintf(), allow compilation with -DDEBUG

Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk

0bef08e5 07/12/2008 06:42 PM Michael Niedermayer

New codec probing system try #1.

Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk

3e86dba2 07/12/2008 04:43 PM Michael Niedermayer

command_streams are type data not unknown.

Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk

ade8d8b9 06/20/2008 05:22 PM Baptiste Coudurier

uniformize AVStream->priv_data freeing in av_close_input_stream

Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk

ccafd472 06/20/2008 05:16 PM Baptiste Coudurier

factorize read_header failure freeing code

Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk

bde15e74 06/03/2008 04:20 PM Stefano Sabatini

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

245976da 05/09/2008 11:56 AM Diego Biurrun

Use full path for #includes from another directory.

Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk

b4bbcd63 04/22/2008 08:08 PM Rafaël Carré

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

11c55efa 03/06/2008 12:26 AM Michael Niedermayer

Skip over unknown extended_content_header tags.
fixes issue358

Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk

16428e63 03/06/2008 12:20 AM Michael Niedermayer

simplify

Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk

7abe4380 02/03/2008 11:18 AM Reimar Döffinger

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

4d65da42 02/02/2008 09:17 PM Reimar Döffinger

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

3dc761a4 01/31/2008 12:22 AM Baptiste Coudurier

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

efc90ebf 12/23/2007 06:08 PM Reimar Döffinger

begining -> beginning typo fix

Originally committed as revision 11309 to svn://svn.ffmpeg.org/ffmpeg/trunk

cd31f8dc 12/20/2007 12:26 AM Aurelien Jacobs

cosmetics: indentation

Originally committed as revision 11279 to svn://svn.ffmpeg.org/ffmpeg/trunk

fd2982a0 12/20/2007 12:25 AM Aurelien Jacobs

remove double check of pb->read_seek

Originally committed as revision 11278 to svn://svn.ffmpeg.org/ffmpeg/trunk

fa13095a 12/17/2007 09:28 AM Björn Axelsson

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...

899681cd 11/21/2007 07:41 AM Björn Axelsson

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

0d4e281c 11/14/2007 07:31 AM Patrice Bensoussan

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

49ce700a 11/06/2007 04:19 PM Björn Axelsson

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...

72be7db4 10/20/2007 02:25 PM Reimar Döffinger

Add support for decrypting asf files

Originally committed as revision 10821 to svn://svn.ffmpeg.org/ffmpeg/trunk

5d25d2a9 10/14/2007 05:44 PM Diego Biurrun

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

29a7b8ef 10/12/2007 11:25 PM Ramiro Polla

Fix memleak
Closes issue 102

Originally committed as revision 10719 to svn://svn.ffmpeg.org/ffmpeg/trunk

6ec14b33 09/09/2007 05:54 PM Patrice Bensoussan

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

da0b94f5 09/02/2007 03:58 PM Michael Niedermayer

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

a9054d91 08/17/2007 06:49 AM Björn Axelsson

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

b43387d4 08/06/2007 08:37 PM Michael Niedermayer

more verbose error

Originally committed as revision 9964 to svn://svn.ffmpeg.org/ffmpeg/trunk

371bf806 08/06/2007 08:36 PM Michael Niedermayer

ignore preroll, it is generally not what AVStream.start_time should contain

Originally committed as revision 9963 to svn://svn.ffmpeg.org/ffmpeg/trunk

60ff1c44 07/27/2007 12:29 AM Michael Niedermayer

ignore invalid packet_obj_size
fixes video5.asf

Originally committed as revision 9807 to svn://svn.ffmpeg.org/ffmpeg/trunk

6f3e0b21 07/19/2007 03:23 PM Panagiotis Issaris

Replace all occurrences of AVERROR_IO with AVERROR.

Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk

629272d8 06/15/2007 09:10 AM Patrice Bensoussan

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

755bfeab 06/12/2007 09:29 AM Diego Biurrun

misc spelling fixes

Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk

18d915dd 05/06/2007 12:04 PM Zuxy Meng

cosmetics: Fix indentation after last commit, patch by Zuxy Meng.

Originally committed as revision 8917 to svn://svn.ffmpeg.org/ffmpeg/trunk

d8470737 04/30/2007 03:56 PM Zuxy Meng

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

57004ff1 04/15/2007 01:51 PM Aurelien Jacobs

add an enum for need_parsing

Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk

6fea687e 04/12/2007 08:11 AM John Donaghy

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

87e87886 04/08/2007 11:34 AM Michael Niedermayer

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

0c0d17f3 03/30/2007 04:20 PM Michael Niedermayer

fix demuxing of IMAG0002.ASF

Originally committed as revision 8558 to svn://svn.ffmpeg.org/ffmpeg/trunk

0b339acb 03/28/2007 02:48 PM Baptiste Coudurier

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

4d38ebfd 03/28/2007 12:03 PM Zuxy Meng

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

09d9672a 03/11/2007 03:36 AM Michael Niedermayer

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

b9c6d01b 03/05/2007 01:19 AM Michael Niedermayer

off by one error

Originally committed as revision 8236 to svn://svn.ffmpeg.org/ffmpeg/trunk

0e3b6a6f 02/20/2007 11:44 PM Ryan Martell

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

559a55ad 02/10/2007 03:36 AM Michael Niedermayer

use dvr-ms timestamps

Originally committed as revision 7905 to svn://svn.ffmpeg.org/ffmpeg/trunk

a836a2c8 02/02/2007 02:33 PM Zuxy Meng

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

30e88789 01/31/2007 11:32 PM Michael Niedermayer

extract aspect ratio

Originally committed as revision 7791 to svn://svn.ffmpeg.org/ffmpeg/trunk

f8f0a0bd 01/29/2007 02:54 PM Michael Niedermayer

fix seeking in wma

Originally committed as revision 7759 to svn://svn.ffmpeg.org/ffmpeg/trunk

de3ae959 01/27/2007 12:07 PM Michael Niedermayer

stealing a few field names from mplayers asf demuxer

Originally committed as revision 7725 to svn://svn.ffmpeg.org/ffmpeg/trunk

0fd9e6f3 01/23/2007 09:25 PM Michael Niedermayer

make the asf demuxer resistant against insertion/deletion errors

Originally committed as revision 7672 to svn://svn.ffmpeg.org/ffmpeg/trunk

f7835507 01/22/2007 09:38 PM Michael Niedermayer

consistant error return for asf_get_packet()

Originally committed as revision 7657 to svn://svn.ffmpeg.org/ffmpeg/trunk

92216453 01/22/2007 09:33 PM Michael Niedermayer

better padsize check

Originally committed as revision 7656 to svn://svn.ffmpeg.org/ffmpeg/trunk

0b93103a 01/22/2007 09:31 PM Michael Niedermayer

more correct error message

Originally committed as revision 7655 to svn://svn.ffmpeg.org/ffmpeg/trunk

ceba96cb 01/22/2007 09:28 PM Michael Niedermayer

replace wrong return 0 by -1

Originally committed as revision 7654 to svn://svn.ffmpeg.org/ffmpeg/trunk

13f7e4b9 01/22/2007 09:17 PM Michael Niedermayer

check to detect nonsense fragment size

Originally committed as revision 7653 to svn://svn.ffmpeg.org/ffmpeg/trunk

1ae7518d 01/22/2007 05:06 PM Michael Niedermayer

inden(ta)tion

Originally committed as revision 7652 to svn://svn.ffmpeg.org/ffmpeg/trunk

200026aa 01/22/2007 05:01 PM Michael Niedermayer

replace nonsense code by something which makes at least some sense

Originally committed as revision 7651 to svn://svn.ffmpeg.org/ffmpeg/trunk

4c71d727 01/22/2007 04:37 PM Michael Niedermayer

check fragment offset and size
yes this too could have been exploitable ...

Originally committed as revision 7650 to svn://svn.ffmpeg.org/ffmpeg/trunk

ae60a857 01/22/2007 12:55 PM Michael Niedermayer

move frame header reading into its own function

Originally committed as revision 7649 to svn://svn.ffmpeg.org/ffmpeg/trunk

b04d5d31 01/22/2007 12:52 PM Michael Niedermayer

more correct packet alignment check and correction

Originally committed as revision 7648 to svn://svn.ffmpeg.org/ffmpeg/trunk

5e2a4855 01/22/2007 12:33 PM Michael Niedermayer

10l

Originally committed as revision 7647 to svn://svn.ffmpeg.org/ffmpeg/trunk

4e15cc8b 01/22/2007 11:04 AM Michael Niedermayer

cosmetics (aligne stuff nicely)

Originally committed as revision 7645 to svn://svn.ffmpeg.org/ffmpeg/trunk

d045b8c1 01/22/2007 11:03 AM Michael Niedermayer

get rid of some sensless malloc/free

Originally committed as revision 7644 to svn://svn.ffmpeg.org/ffmpeg/trunk

916bb12c 01/22/2007 11:01 AM Michael Niedermayer

simplify

Originally committed as revision 7643 to svn://svn.ffmpeg.org/ffmpeg/trunk

6bb2a2df 01/22/2007 10:53 AM Michael Niedermayer

remove a few unused and duplicated variables

Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk

05219463 01/22/2007 03:19 AM Michael Niedermayer

adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
note, the original code might have been exploitable

Originally committed as revision 7640 to svn://svn.ffmpeg.org/ffmpeg/trunk

b83e83b9 01/22/2007 01:21 AM Michael Niedermayer

cosmetic

Originally committed as revision 7639 to svn://svn.ffmpeg.org/ffmpeg/trunk

fc9eb137 01/22/2007 12:20 AM Michael Niedermayer

these variables seem to be unused on the demuxer side so theres no sense in setting them

Originally committed as revision 7636 to svn://svn.ffmpeg.org/ffmpeg/trunk