Martin Storsjö
cc41167aed
asfdec: Check the return value of asf_read_stream_properties
...
This makes sure errors in setting stream parameters are passed
on to the caller. This avoids successfully opening files while
some parameters aren't filled in properly.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Vladimir Pantelic
5f40833360
asfdec: substract preroll time from marker presentation time
...
this was forgotten when we changed ASF to not output the preroll time
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Diego Biurrun
7950e519bb
Disable deprecation warnings for cases where a replacement is available
12 years ago
Diego Biurrun
2832ea26f3
Remove commented-out debug #define cruft
12 years ago
Diego Biurrun
e926b5ceb1
avformat: Drop unnecessary ff_ name prefixes from static functions
12 years ago
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>
12 years ago
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.
12 years ago
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.
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
Vladimir Pantelic
36fab50e90
asfdec: silence a warning
...
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Diego Biurrun
48a4ffa722
asf: K&R formatting cosmetics
12 years ago
Diego Biurrun
e817d9139f
asfdec: Fix printf format string length modifier
12 years ago
Anton Khirnov
292a08cbab
asfdec: cosmetics, reformat ff_asf_parse_packet()
12 years ago
Diego Biurrun
72eaba5e4f
avformat: Convert some commented-out printf/av_log instances to av_dlog
12 years ago
Diego Biurrun
11d4e92ed9
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
12 years ago
Martin Storsjö
e6153f173a
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
13 years ago
Diego Biurrun
0177b7d23a
Improve descriptiveness of a number of codec and container long names
13 years ago
Anton Khirnov
5e745cefc0
asfdec: read attached pictures.
13 years ago
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>
13 years ago
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>
13 years ago
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).
13 years ago
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
13 years ago
Justin Ruggles
bdbf1fa405
asfdec: Do not set AVCodecContext.frame_size
13 years ago
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
13 years ago
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
13 years ago
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
13 years ago
Diego Biurrun
6df5c528ca
Move some conditionally used variables into the block where they are used.
...
This allows dropping the av_unused argument from them.
13 years ago
Anton Khirnov
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
13 years ago
Justin Ruggles
e9dc920127
asfdec: add side data to ASFStream packet instead of output packet.
...
fixes memleak of side data
13 years ago
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>
13 years ago
Luca Barbato
73f027c17b
asf: do not call av_read_frame
...
The asf_read_pts should read the bitstream directly.
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Diego Biurrun
2f5df0b12c
Replace ffmpeg references with more accurate libav* references.
13 years ago
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.
13 years ago
Anton Khirnov
1fa395e471
lavf: use avpriv_ prefix for ff_new_chapter().
...
It's used in libavdevice.
13 years ago
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)/'
13 years ago
Anton Khirnov
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
14 years ago
Mans Rullgard
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
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>
14 years ago
Diego Biurrun
91c9aa0941
Move some conditionally used code below the appropriate #ifdef.
14 years ago
Anton Khirnov
d2d67e424f
Remove all uses of now deprecated metadata functions.
14 years ago
Mans Rullgard
e65ab9d94f
Remove unused variables
14 years ago
Mans Rullgard
b122c65107
asfdec: add missing #include for av_bswap32()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Uoti Urpala
29fa570d0c
asfdec: fix possible overread on broken files.
14 years ago
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.
14 years ago
Vladimir Pantelic
b58bc17cf7
asfdec: reindent after previous commit c7bd5ed
14 years ago
Vladimir Pantelic
c7bd5edae4
asfdec: fallback to binary search internally
...
lavf will do that anyway in case seek by index fails
14 years ago