virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
37,701 Commits 37 Branches 400 Tags 462 MiB
874c8a17ac
Commit Graph

144 Commits

Author SHA1 Message Date
Diego Biurrun
2832ea26f3 Remove commented-out debug #define cruft 2013-05-16 00:23:30 +02:00
Diego Biurrun
e926b5ceb1 avformat: Drop unnecessary ff_ name prefixes from static functions 2013-04-30 16:16:23 +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
Anton Khirnov
1afddbe59e avpacket: use AVBuffer to allow refcounting the packets. 
This will allow us to avoid copying the packets in many cases.

This breaks ABI.
 2013-03-08 07:33:45 +01:00
Anton Khirnov
1ef0e8a6bf asfdec: do not assume every AVStream has a corresponding ASFStream 
This won't be true for ID3 attached picture.

Also stop allocating now useless dummy ASFStreams for ASF native
attached pictures.
 2013-02-09 18:57:21 +01:00
Vladimir Pantelic
f5fac6f777 asfdec: support reading ID3v2 tags in ASF files 
Yes, these files do exist

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01: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
Vladimir Pantelic
61f9ad2dfc asfdec: read the full Metadata Object, not just aspect ratio information 
Use the same get_tag()/get_value() as for the Extended Content Description
but handle the 16 bit vs 32 bit difference for type 2 (BOOL)

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-02-09 18:57:21 +01:00
Vladimir Pantelic
36fab50e90 asfdec: silence a warning 
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
48a4ffa722 asf: K&R formatting cosmetics 2013-02-06 09:48:51 +01:00
Diego Biurrun
e817d9139f asfdec: Fix printf format string length modifier 2013-01-07 09:21:42 +01:00
Anton Khirnov
292a08cbab asfdec: cosmetics, reformat ff_asf_parse_packet() 2012-10-24 08:46:45 +02:00
Diego Biurrun
72eaba5e4f avformat: Convert some commented-out printf/av_log instances to av_dlog 2012-10-01 10:24:28 +02:00
Diego Biurrun
11d4e92ed9 avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
Martin Storsjö
e6153f173a avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:44 +03:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Diego Biurrun
0177b7d23a Improve descriptiveness of a number of codec and container long names 2012-07-30 20:46:55 +02:00
Anton Khirnov
5e745cefc0 asfdec: read attached pictures. 2012-07-02 16:16:45 +02:00
Martin Storsjö
75b7feaeb4 asfdec: Add an option for not searching for the packet markers 
Some streams don't contain these.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-07 01:01:03 +03:00
Martin Storsjö
20234a4bd7 cosmetics: Align muxer/demuxer declarations 
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-06 19:19:59 +03:00
Ronald S. Bultje
44257ef426 asf: only set index_read if the index contained entries. 
This allows falling back to a binary search if the file contains no
index, thus fixing seeking in such files (e.g. luckynight.wma).
 2012-03-28 10:22:25 -07:00
Ronald S. Bultje
e73c6aaabf asf: reset side data elements on packet copy. 
Prevents crash (double free) when free()ing the original packet.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Justin Ruggles
bdbf1fa405 asfdec: Do not set AVCodecContext.frame_size 2012-02-29 15:45:50 -05:00
Ronald S. Bultje
bb6d5411e1 asf: don't seek back on EOF. 
Seeking back on EOF will reset the EOF flag, causing us to re-enter
the loop to find the next marker in the ASF file, thus potentially
causing an infinite loop.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-28 16:25:05 -08:00
Ronald S. Bultje
6e57a02b9f asf: error out on ridiculously large minpktsize values. 
They cause various issues further down in demuxing.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-28 14:32:34 -08:00
Ronald S. Bultje
41afac7f7a asf: prevent packet_size_left from going negative if hdrlen > pktlen. 
This prevents failed assertions further down in the packet processing
where we require non-negative values for packet_size_left.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-02-18 09:12:32 -08:00
Diego Biurrun
6df5c528ca Move some conditionally used variables into the block where they are used. 
This allows dropping the av_unused argument from them.
 2012-02-13 19:20:54 +01:00
Anton Khirnov
6e9651d106 lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
Justin Ruggles
e9dc920127 asfdec: add side data to ASFStream packet instead of output packet. 
fixes memleak of side data
 2011-12-21 17:52:31 -05:00
John Stebbins
b88eb87630 asf: use packet dts as approximation of pts 
Having a somehow off seeking is better than having none at all.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-02 11:11:47 +01:00
Luca Barbato
73f027c17b asf: do not call av_read_frame 
The asf_read_pts should read the bitstream directly.
 2011-12-02 11:11:47 +01:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Diego Biurrun
2f5df0b12c Replace ffmpeg references with more accurate libav* references. 2011-11-02 10:42:55 +01:00
Anton Khirnov
a2faa95151 lavf: make some seeking functions private 
Specifically av_update_cur_dts(), av_seek_frame_binary() and
av_gen_search().

They are not supposed to be called outside lavf.
 2011-10-28 09:23:24 +02:00
Anton Khirnov
1fa395e471 lavf: use avpriv_ prefix for ff_new_chapter(). 
It's used in libavdevice.
 2011-10-20 20:57:23 +02:00
Anton Khirnov
3b3bbdd3e6 lavf,lavd: replace av_new_stream->avformat_new_stream part I. 
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
 2011-10-19 17:02:11 +02:00
Anton Khirnov
dfc2c4d900 lavf: use designated initialisers for all (de)muxers. 
It's more readable and less prone to breakage.
 2011-07-17 06:58:37 +02:00
Mans Rullgard
0ebcdf5cda Do not include mathematics.h in avutil.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:42:06 +01:00
Mans Rullgard
add41decd9 Remove return statements following infinite loops without break 
These statements cannot be reached and are thus not needed.
This removes a number of compiler warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-03 21:39:07 +01:00
Diego Biurrun
91c9aa0941 Move some conditionally used code below the appropriate #ifdef. 2011-07-03 18:30:01 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Mans Rullgard
b122c65107 asfdec: add missing #include for av_bswap32() 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-05-19 12:38:43 +01:00
Uoti Urpala
29fa570d0c asfdec: fix possible overread on broken files. 2011-05-17 22:06:00 +02:00
Vladimir Pantelic
69fa23961e asfdec: do not fall back to binary/generic search 
asf_read_seek() inside the asf demuxer already does the
right thing, it tries the index and if that fails it uses
binary search. If binary search is called from outside of asfdec.c
it will fail because the asf code cannot clean up after itself.
Therefore introduce AVFMT_NOBINSEARCH that prevents the seek
code to fallback to binary search and AVFMT_NOGENSEARCH that
prevents the seek code to fallback to generic search.
 2011-05-17 22:06:00 +02:00
Vladimir Pantelic
b58bc17cf7 asfdec: reindent after previous commit c7bd5ed 2011-05-17 22:05:22 +02:00
Vladimir Pantelic
c7bd5edae4 asfdec: fallback to binary search internally 
lavf will do that anyway in case seek by index fails
 2011-05-17 21:48:16 +02:00
Uoti Urpala
0bd433a916 asfdec: fix assert failure on invalid files 
Add an extra size validity check in asf_read_frame_header(). Without
this asf->packet_size_left may become negative, which triggers an
assertion failure later.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-03 22:36:08 -04:00
Ronald S. Bultje
f8b1245922 asfdec: fix parsing of packets that overrun into padding. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-03 22:14:04 -04:00
Vladimir Pantelic
8408e1d7d6 asf: remove commented out code in asf_read_seek 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-04-20 12:47:13 +01:00