generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
64,359 Commits 24 Branches 241 Tags 173 MiB
79d3eeb2b7
Commit Graph

276 Commits

Author SHA1 Message Date
Anton Khirnov
7c7253802b asfdec: use an ASFContext array for storing stream bitrates 
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 22:26:03 -05:00
Anton Khirnov
d42b09723e asfdec: move DAR list to ASFContext 
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 22:26:00 -05:00
Anton Khirnov
569ff02168 asfdec: remove some write-only values from the context 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-09 22:41:30 +00:00
Anton Khirnov
4bc328a2bd asf: split ASFContext into muxer and demuxer parts. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-09 15:31:09 -05:00
Anton Khirnov
e4e234fad7 asf: make ff_guidcmp inline and move it to asf.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-09 12:33:05 +00: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
Anton Khirnov
8270482681 asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d)
 2011-01-30 03:41:00 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Anton Khirnov
042950542d asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:33:45 +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
Anton Khirnov
24519edf64 asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
f9d6b13a23 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 <janne-ffmpeg@jannau.net>
(cherry picked from commit 93b78d1210)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
2934cd9dbf asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Anton Khirnov
93b78d1210 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 <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Peter Ross
a750050f4c 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
 2010-12-26 01:26:29 +00:00
Reimar Döffinger
bf09a01981 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
 2010-12-18 13:18:52 +00:00
Reimar Döffinger
4172951ba7 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
 2010-12-11 21:41:47 +00:00
Reimar Döffinger
3c3ef81b9b Ensure that packets returned from ASF demuxer are properly 0-padded. 
Originally committed as revision 25930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-11 21:39:08 +00:00
Stefan Gehrer
77b7c334be 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
 2010-12-03 07:49:07 +00:00
Anton Khirnov
ad7768f4c4 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
 2010-10-16 13:20:41 +00:00
Anton Khirnov
03700d399b 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
 2010-10-15 19:04:25 +00:00
Stefano Sabatini
b9f9e59afc 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
 2010-09-25 23:27:16 +00:00
Carl Eugen Hoyos
b7d56a17ae Fix indentation after r25158. 
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-23 09:53:26 +00:00
Richard Buteau
6ac6e3d123 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
 2010-09-23 03:40:06 +00:00
Martin Storsjö
d970ec7554 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
 2010-07-20 13:08:10 +00:00
Martin Storsjö
fed7959271 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
 2010-07-20 11:52:29 +00:00
Martin Storsjö
a3ab7c3249 asfdec: Handle asf_jfif_media 
Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 11:50:57 +00:00
Måns Rullgård
8fc0162ac4 Add av_ prefix to bswap macros 
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 22:12:30 +00:00
Michael Niedermayer
3124766959 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
 2010-07-07 10:39:05 +00:00
Måns Rullgård
30cdfb49b4 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
 2010-06-24 15:10:06 +00:00
Michael Niedermayer
1d4c1c3b7a 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
 2010-06-23 02:04:55 +00:00
Alex Converse
1ed87f800f 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
 2010-05-26 04:22:52 +00:00
Michael Niedermayer
cb0061d453 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
 2010-05-07 08:08:09 +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
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
Benoit Fouet
32e543f866 Replace @returns by @return. 
Originally committed as revision 22729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 15:50:57 +00:00
Vladimir Pantelic
88b51ea948 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
 2010-03-08 13:13:18 +00:00
Anton Khirnov
e4ea625ab0 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
 2010-02-25 16:38:23 +00:00
Anton Khirnov
fce4448948 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
 2010-02-24 18:19:54 +00:00
Benoit Fouet
6538c0f1c6 asfdec: skip byte array tags. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771 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
 2010-02-24 07:33:18 +00:00
Benoit Fouet
47794b9d3e asfdec: fix a memleak. 
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d 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
 2010-02-24 07:31:03 +00:00
Anton Khirnov
4a3104a96a 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
 2010-02-15 21:14:47 +00:00
Michael Niedermayer
134271c232 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
 2009-12-16 21:24:04 +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 G. Taylor
febd1c90a6 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
 2009-10-11 23:09:33 +00:00
Josh Harris
f2086fb50e 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
 2009-08-30 18:14:22 +00:00
Ronald S. Bultje
2078ca16ee 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
 2009-07-26 19:09:35 +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
Reimar Döffinger
96f0731a26 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
 2009-07-06 17:08:32 +00:00
Reimar Döffinger
b098b30905 Fix indentation 
Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:18:56 +00:00
Reimar Döffinger
68a10b40bc 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
 2009-07-03 11:18:07 +00:00
Ronald S. Bultje
91d19d471b 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
 2009-06-24 23:04:05 +00:00
Daniel Verkamp
1a40491ef2 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
 2009-06-22 23:09:34 +00:00
Ronald S. Bultje
277a28e8fc 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
 2009-06-09 20:58:32 +00:00
Baptiste Coudurier
46b4019bfa fix get_str16_nolen with odd len, fix #1065 
Originally committed as revision 18929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-24 10:26:41 +00:00
Baptiste Coudurier
c9d7cd6dca 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
 2009-05-24 09:59:53 +00:00
Cyril Comparon
5f1ac36dd2 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
 2009-05-12 12:35:46 +00:00
Diego Biurrun
dc1ed61432 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
 2009-04-19 13:29:11 +00:00
Diego Biurrun
e0a6d2c365 Revert previous removal of gsize variable. It breaks seeking. 
Originally committed as revision 18618 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-19 11:40:03 +00:00
Diego Biurrun
7b7b19b620 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
 2009-04-18 15:01:20 +00:00
Michael Niedermayer
5ce73e2352 Remove nonsensical assignment from asf_read_seek() found by CSA. 
Originally committed as revision 18565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 15:13:01 +00:00
Michael Niedermayer
236580b478 Remove unused variable from asf_read_header() found by CSA. 
Originally committed as revision 18555 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 14:16:37 +00:00
Ronald S. Bultje
1d0036b01f Change another AVERROR(EIO) 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
tread).

Originally committed as revision 18552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 14:05:57 +00:00
Michael Niedermayer
d728e3cd28 Moving variable declarations in asf_build_simple_index() to clarify&prettify code. 
Originally committed as revision 18543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 12:37:39 +00:00
Ronald S. Bultje
799a0722fc Replace AVERROR(EIO) 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
 2009-04-16 00:41:31 +00:00
Ronald S. Bultje
be0395103a 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
 2009-03-28 03:54:31 +00:00
Reimar Döffinger
b8b00d9429 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
 2009-03-18 14:03:40 +00:00
Reimar Döffinger
4d0c3dc0d5 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
 2009-03-18 13:17:23 +00:00
avcoder
6d050dd673 cosmetics: fix indentation, patch by avcoder, ffmpeg gmail com 
Originally committed as revision 18022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-17 12:27:32 +00:00
Aurelien Jacobs
719e721a14 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
 2009-03-01 00:12:08 +00:00
Aurelien Jacobs
17af052531 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
 2009-02-26 16:17:17 +00:00
Aurelien Jacobs
5e293c424d 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
 2009-02-26 15:44:19 +00:00