Diego Biurrun
48a4ffa722
asf: K&R formatting cosmetics
12 years ago
Michael Niedermayer
fe6767f849
asfdec: fix integer overflow in packet_replic_size check
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
e817d9139f
asfdec: Fix printf format string length modifier
12 years ago
Michael Niedermayer
80aa89bdff
asfdec: check extradata size before alloc and read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
b7280cff9a
asfdec: check stream_index for validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e5927910c2
asfdec: flip the interpretation of the header aspect back
...
This reverts 2de8877689
Fixes Ticket 1883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
343c73e252
asfdec: parse aspect ratio payload extension
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8c93269e42
asfdec: correctly parse payload extensions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2d8c76eb1f
asfdec: parse payload extension list
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ed68085104
asfdec: fixed signedness in comparission
...
Fixes CID739864
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
292a08cbab
asfdec: cosmetics, reformat ff_asf_parse_packet()
12 years ago
Michael Niedermayer
d8f27eceaa
asfdec: ignore stored duration for truncated files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Michael Niedermayer
2de8877689
asfdec: invert SAR
...
It appears this was wrong
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Michael Niedermayer
e47d979cab
asfdec: ignore too tiny indexes
...
Fixes Ticket1521
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7d23a65f0d
asfdec: fix FRAME_HEADER_SIZE
...
Fixes Ticket1477
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
12 years ago
Diego Biurrun
0177b7d23a
Improve descriptiveness of a number of codec and container long names
12 years ago
Anton Khirnov
5e745cefc0
asfdec: read attached pictures.
13 years ago
Martin T. H. Sandsmark
a5c1a0c070
asfdec: fix returned error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Michael Niedermayer
b61e596a14
asf: remove duplicated index_guid
...
Found-by:ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Reimar Döffinger
6003ec880b
asfdec: Move variable declarations into the blocks they are used in.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Michael Niedermayer
0d4404ed65
asfdec: fix endless loop on EOF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Michael Niedermayer
53cb0de25b
asfdec: mark only ts1 as av_unused
...
Idea-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
6760bd0a19
asfdec: avoid unused variable warning.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
ba7f18876c
asfdec: use dts for seeking.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
bb4eabacea
asfdec: restore timestamp reading code
...
This reverts part of:
commit e65ab9d94f
Author: Mans Rullgard <mans@mansr.com>
Date: Wed Jun 1 17:26:27 2011 +0100
Remove unused variables
13 years ago
Clément Bœsch
53d70a334a
Rename remaining get_buffer to avio_read.
13 years ago
Diego Biurrun
2f5df0b12c
Replace ffmpeg references with more accurate libav* references.
13 years ago
Michael Niedermayer
60fcc19bff
asfdec: Check packet_replic_size earlier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Michael Niedermayer
2eaa55375b
asf: export all the DRM stuff, some of it are human readable strings.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago