virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
44,997 Commits 37 Branches 400 Tags 467 MiB
e7adf2250b
Commit Graph

55 Commits

Author SHA1 Message Date
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Alexandra Hájková
b08569a239 lavf: Replace the ASF demuxer 
The old one is the result of the reverse engineering and guesswork.
The new one has been written following the now-available specification.

This work is part of Outreach Program for Women Summer 2014 activities
for the Libav project.

The fate references had to be changed because the old demuxer truncates
the last frame in some cases, the new one handles it properly.
The seek-test reference is changed because seeking works differently
in the new demuxer. When seeking, the packet is not read from the stream
directly, but it is rather constructed by the demuxer. That is why
position is -1 now in the reference.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-06-28 10:16:40 +02:00
Vladimir Pantelic
09f3c937ed asfenc: remember send time and offset of the index entries 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-19 19:37:59 +02:00
Vladimir Pantelic
1eb9328030 asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-09-19 19:37:46 +02:00
Peter Ross
e544782623 riff: Move guid structs and helper functions into riff 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-21 18:20:30 +02:00
Vladimir Pantelic
84b721db36 asfdec: also read Metadata Library Object 
In some ASF files this objects holds cover art and other tags. Compared to
Metadata Object it can also hold GUIDs, but we ignore these for now.

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Diego Biurrun
e4cbf7529b Give all anonymously typedeffed structs in headers a name 
Anonymous structs cannot be forward declared and have no benefit.
 2012-10-06 09:27:11 +02:00
Kostya Shishkov
2d8591c27e make containers pass palette change in AVPacket 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-04-15 18:02:05 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05: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
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
dccbd97d72 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 <mans@mansr.com>
 2011-01-21 20:21:51 +00: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
Martin Storsjö
7428c8f599 asf: Add asf_jfif_media guid 
Originally committed as revision 24350 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-20 11:50:22 +00:00
Zhentan Feng
852e0ca555 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
 2010-03-24 18:40:43 +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
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
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
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
Diego Biurrun
e19f995263 Fix bandwith vs. bandwiDth typo. 
Originally committed as revision 18804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-12 23:40:22 +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
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
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
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Ronald S. Bultje
1d217cdb3f 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
 2008-12-18 01:28:29 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Diego Biurrun
64bb7bd519 typo: begining --> beginning 
Originally committed as revision 11312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-23 21:01:09 +00:00
Vitor Sessak
52b541ad79 spelling 
Originally committed as revision 11122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-12-01 22:21:04 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Guillaume Poirier
efb775777f add a comment to indicate which #endif belong to which #define 
Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-17 18:59:28 +00:00
Måns Rullgård
699b3f99d0 add multiple inclusion guards to headers 
Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-17 00:01:30 +00:00
Måns Rullgård
99545457bf include all prerequisites in header files 
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:59:13 +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
Michael Niedermayer
190972a06e iam pretty sure send time is dts and not pts ... 
Originally committed as revision 7879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-07 23:06:13 +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
4c71d72701 check fragment offset and size 
yes this too could have been exploitable ...

Originally committed as revision 7650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-22 16:37:45 +00:00
Michael Niedermayer
4c6f7440af doxygenize comments 
Originally committed as revision 7646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-22 11:15:30 +00:00
Michael Niedermayer
6bb2a2dfb9 remove a few unused and duplicated variables 
Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-22 10:53:57 +00:00
Michael Niedermayer
24c14d6d01 simplify GUIDs 
Originally committed as revision 7611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 20:06:19 +00:00
Ryan Martell
73fe1052dd Minor modifications to handle mms streaming. 
Patch by Ryan Martell rdm4 martellventures com.

Originally committed as revision 7221 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-04 15:46:32 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
52e5461288 fix fallback if theres no index 
fix index less seeking

Originally committed as revision 6055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-23 20:24:58 +00:00
Kohn Emil Dan
b6eaae39b4 The reader ignores the size of the ASF data object and keeps on 
reading even beyond it.
Therefore if the ASF file includes an index object at its end, the
reader will treat the index like data, but of course will fail since
it thinks that the data is corrupted.
When reading an asf file with an index object, ffmpeg will
complain at the end of the file that it read an invalid header.
Patch by Kohn Emil Dan, < emild A cs P technion P ac P il >
Original thead:
Date: Apr 18, 2006 4:11 PM
Subject: [Ffmpeg-devel] Two ASF related bugs and fixes

Originally committed as revision 5857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 16:07:19 +00:00
Michael Niedermayer
88141c9192 audio in dvr-ms demuxing support by (John Donaghy <johnfdonaghy gmail com<) 
Originally committed as revision 4874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-20 23:48:16 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00