Statistics
| Branch: | Revision:

ffmpeg / libavformat / asfdec.c @ e4e234fa

History | View | Annotate | Download (46.1 KB)

# Date Author Comment
e4e234fa 02/09/2011 12:33 PM Anton Khirnov

asf: make ff_guidcmp inline and move it to asf.h

Signed-off-by: Mans Rullgard <>

dfd2a005 01/29/2011 10:55 PM Luca Barbato

Replace dprintf with av_dlog

dprintf clashes with POSIX.1-2008

04295054 01/28/2011 08:33 PM Anton Khirnov

asfdec: ensure that the whole tag is read.

Signed-off-by: Janne Grunau <>

c6610a21 01/26/2011 10:10 PM Diego Elio Pettenò

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.

2934cd9d 01/25/2011 08:48 PM Anton Khirnov

asfdec: remove some commented-out cruft

Signed-off-by: Janne Grunau <>

93b78d12 01/25/2011 08:48 PM Anton Khirnov

lavf: make a variant of ff_get_str16_nolen public

It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <>

a750050f 12/26/2010 01:26 AM Peter Ross

make guid utility function visibile to other modules (ff_guidcmp, ff_get_guid)

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

bf09a019 12/18/2010 01:18 PM Reimar Döffinger

Change ASF demuxer to return incomplete last packets.
Whether the behaviour for streams using scrambling makes sense
is unclear.

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

4172951b 12/11/2010 09:41 PM Reimar Döffinger

Return an error when get_buffer reads none or only partial data instead
of returning packets with uninitialized data.
Returning partial packets as for other demuxers is problematice due to
packet scrambling and thus is not done.

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

3c3ef81b 12/11/2010 09:39 PM Reimar Döffinger

Ensure that packets returned from ASF demuxer are properly 0-padded.

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

77b7c334 12/03/2010 07:49 AM Stefan Gehrer

skip top-level objects to search for the simple index in ASF files

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

ad7768f4 10/16/2010 01:20 PM Anton Khirnov

add ff_ prefix to metadata_conv()
patch by Anton Khirnov anton at khirnov dot net

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

03700d39 10/15/2010 07:04 PM Anton Khirnov

Export metadata in the generic format. Deprecate old conversion API.
patch by Anton Khirnov anton at khirnov dot net

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

b9f9e59a 09/25/2010 11:27 PM Stefano Sabatini

Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
corresponding AVMEDIA_TYPE_* symbols.

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

b7d56a17 09/23/2010 09:53 AM Carl Eugen Hoyos

Fix indentation after r25158.

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

6ac6e3d1 09/23/2010 03:40 AM Richard Buteau

Fix aspect ratio for files that have it stored in
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

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

d970ec75 07/20/2010 01:08 PM Martin Storsjö

asfdec: 10l, fix the minimum asf video stream header size

This fixes the regression test breakage.

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

fed79592 07/20/2010 11:52 AM Martin Storsjö

asfdec: Don't read the video stream header if there isn't enough data

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

a3ab7c32 07/20/2010 11:50 AM Martin Storsjö

asfdec: Handle asf_jfif_media

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

8fc0162a 07/10/2010 10:12 PM Måns Rullgård

Add av_ prefix to bswap macros

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

31247669 07/07/2010 10:39 AM Michael Niedermayer

Ignore extradata & w/h in asf/dvr.
The w/h values are wrong and extradata contains a fake seq header that causes
decoding to fail later, a valid seq header is in the stream itself.
Partially fixes issue658

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

30cdfb49 06/24/2010 03:10 PM Måns Rullgård

asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()

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

1d4c1c3b 06/23/2010 02:04 AM Michael Niedermayer

Continue after guids in asf after which other guids are possible instead of skiping
over the stored size.
Fixes issue2029

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

1ed87f80 05/26/2010 04:22 AM Alex Converse

Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.

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

cb0061d4 05/07/2010 08:08 AM Michael Niedermayer

Favor chunk size over hitting the correct position after reading the chunk size in asf.
Fixes issue1923

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

2ef6c124 04/25/2010 02:27 PM Stefano Sabatini

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

cc947f04 03/31/2010 12:29 PM Jean-Daniel Dupas

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

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

32e543f8 03/30/2010 03:50 PM Benoit Fouet

Replace @returns by @return.

Originally committed as revision 22729 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

e4ea625a 02/25/2010 04:38 PM Anton Khirnov

asfdec: don't strip the "WM/" prefix, this should be done during conversion.
Patch by Anton Khirnov wyskas gmail com

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

fce44489 02/24/2010 06:19 PM Anton Khirnov

Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
metadata system.

Patch by Anton Khirnov <wyskas gmail com>.

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

6538c0f1 02/24/2010 07:34 AM Benoit Fouet

asfdec: skip byte array tags.
Patch from Anton Khirnov wyskas gmail

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

27e74927 02/24/2010 07:33 AM Benoit Fouet

asfdec: add a debug message about skipped tags.
Patch from Anton Khirnov wyskas gmail

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

47794b9d 02/24/2010 07:32 AM Benoit Fouet

asfdec: fix a memleak.
Patch from Anton Khirnov wyskas gmail

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

514b73cf 02/24/2010 07:31 AM Benoit Fouet

asfdec: only unicode tags must have even length.
Patch from: Anton Khirnov wyskas gmail

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

4a3104a9 02/15/2010 09:14 PM Anton Khirnov

workaround for broken files created by previous versions of asfenc.

Patch by Anton Khirnov, wyskas gmail

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

134271c2 12/16/2009 09:24 PM Michael Niedermayer

Only add 1 index entry per keyframe.
Idea from a patch by samsung.

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

12ad6671 12/13/2009 08:27 PM Michael Niedermayer

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

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

f2086fb5 08/30/2009 06:14 PM Josh Harris

Fix incorrect display of ASF/WMV duration after r12926.

Patch by Josh Harris, qt tateu net

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

2078ca16 07/26/2009 07:09 PM Ronald S. Bultje

Add handling of EAGAIN at packet boundaries. See "[PATCH] RTSP-MS 14/15:
ASF packet parsing" thread for discussion / reasoning.

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

63613fe6 07/26/2009 12:20 PM Måns Rullgård

Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN

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

96f0731a 07/06/2009 05:08 PM Reimar Döffinger

Check for packet_length 0, it is already treated as invalid by the padding check,
but that resulted in a confusing/wrong error message.

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

b098b309 07/03/2009 11:18 AM Reimar Döffinger

Fix indentation

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

68a10b40 07/03/2009 11:18 AM Reimar Döffinger

Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.

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

91d19d47 06/24/2009 11:04 PM Ronald S. Bultje

Remove any reference to ASFContext.packet_size and replace it with
AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use
AVFormatContext->packet_size instead of own copy" thread on ML.

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

1a40491e 06/22/2009 11:09 PM Daniel Verkamp

Add ff_ prefixes to exported symbols in libavformat/riff.h.
patch by Daniel Verkamp, aniel drv nu

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

277a28e8 06/09/2009 08:58 PM Ronald S. Bultje

Make asf_get_packet() and asf_parse_packet() static. See "[PATCH] asfdec.c:
make get/parse_packet static" thread from 2 months ago.

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

46b4019b 05/24/2009 10:26 AM Baptiste Coudurier

fix get_str16_nolen with odd len, fix #1065

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

c9d7cd6d 05/24/2009 09:59 AM Baptiste Coudurier

move DEBUG define before include to get dprintf and move guidcmp before print_guid, fix compilation with DEBUG

Originally committed as revision 18928 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

dc1ed614 04/19/2009 01:29 PM Diego Biurrun

Mark gsize variable as av_unused, fixes the warning:
libavformat/asfdec.c:995: warning: unused variable ‘gsize’

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

e0a6d2c3 04/19/2009 11:40 AM Diego Biurrun

Revert previous removal of gsize variable. It breaks seeking.

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

7b7b19b6 04/18/2009 03:01 PM Diego Biurrun

Remove unused variable gsize, fixes the warning:
libavformat/asfdec.c:995: warning: unused variable 'gsize'

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

5ce73e23 04/17/2009 03:13 PM Michael Niedermayer

Remove nonsensical assignment from asf_read_seek() found by CSA.

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

236580b4 04/17/2009 02:16 PM Michael Niedermayer

Remove unused variable from asf_read_header() found by CSA.

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

1d0036b0 04/17/2009 02:05 PM Ronald S. Bultje

Change another AVERROR inot AVERROR_EOF, because it really signals EOF,
not a stream error. This also fixes an infinite loop on EOS during ASF file
playback, and Michael claims he "likes the patch" (ref: [PATCH] RTSP-MS
15/15: move packet_time_start zero value assignment in asf.c" mailinglist...

d728e3cd 04/17/2009 12:37 PM Michael Niedermayer

Moving variable declarations in asf_build_simple_index() to clarify&prettify code.

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

799a0722 04/16/2009 12:41 AM Ronald S. Bultje

Replace AVERROR by AVERROR_EOF on end-of-file. See mailinglist
thread "[PATCH] RTSP-MS 15/15: move packet_time_start zero value
assignment in asf.c".

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

be039510 03/28/2009 03:54 AM Ronald S. Bultje

Don't strip the first three characters off of any metadata in ASF file.
See "[FFmpeg-devel] [PATCH] asf fix" thread. Patch contributed by
David DeHaven <dave sagetv com>.

Originally committed as revision 18213 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

4d0c3dc0 03/18/2009 01:17 PM Reimar Döffinger

Add a special guidcmp function to compare ASF guids, to avoid the many
duplicated sizeof(GUID).

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

6d050dd6 03/17/2009 12:27 PM avcoder

cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com

Originally committed as revision 18022 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