Michael Niedermayer
133055c5e4
reverts parts of commit de11ee906e
. The author of this patch has a poor understanding of the code
14 years ago
Vladimir Pantelic
de11ee906e
asfdec: subtract the preroll value and thus output 0 based timestamps
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
3e68b3ba7b
avio: deprecate url_ferror
...
AVIOContext.error should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
)
14 years ago
Anton Khirnov
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
)
14 years ago
Anton Khirnov
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
)
14 years ago
Anton Khirnov
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Mans Rullgard
288b62b1b9
asfdec: fix build for big endian targets
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aabc2682fc
)
14 years ago
Anton Khirnov
607f5fe5d6
asfdec: split reading stream properties out of asf_read_header()
...
This contains a rename from gsize->size
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8bf6db1b29
)
14 years ago
Mans Rullgard
aabc2682fc
asfdec: fix build for big endian targets
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
5cbd3b5d91
asfdec: don't export empty metadata
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
8bf6db1b29
asfdec: split reading stream properties out of asf_read_header()
...
This contains a rename from gsize->size
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
4ca29c6534
asfdec: deobfuscate reading video properties size
...
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0b1d291a71
)
14 years ago
Anton Khirnov
e5d4a95334
asfdec: split asf_read_header()
...
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c1fea23070
)
14 years ago
Anton Khirnov
d928651011
asfdec: skip the stream bitrate list
...
Its contents aren't used for anything.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d7a5106eb2
)
14 years ago
Anton Khirnov
56a67a8d61
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>
(cherry picked from commit 7c7253802b
)
14 years ago
Anton Khirnov
26783e8570
asfdec: move DAR list to ASFContext
...
This will be useful for splitting asf_read_header()
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d42b09723e
)
14 years ago
Anton Khirnov
c3052f1dcc
asfdec: remove some write-only values from the context
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 569ff02168
)
14 years ago
Anton Khirnov
83120e3bd7
asf: split ASFContext into muxer and demuxer parts.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4bc328a2bd
)
14 years ago
Anton Khirnov
b9afb0446d
asf: make ff_guidcmp inline and move it to asf.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad7
)
14 years ago
Anton Khirnov
0b1d291a71
asfdec: deobfuscate reading video properties size
...
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
c1fea23070
asfdec: split asf_read_header()
...
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
d7a5106eb2
asfdec: skip the stream bitrate list
...
Its contents aren't used for anything.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
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>
14 years ago
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>
14 years ago
Anton Khirnov
569ff02168
asfdec: remove some write-only values from the context
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
4bc328a2bd
asf: split ASFContext into muxer and demuxer parts.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e4e234fad7
asf: make ff_guidcmp inline and move it to asf.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
14 years ago
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
)
14 years ago
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
14 years ago
Anton Khirnov
042950542d
asfdec: ensure that the whole tag is read.
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
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
)
14 years ago
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.
14 years ago
Anton Khirnov
24519edf64
asfdec: remove some commented-out cruft
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf
)
14 years ago
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
)
14 years ago
Anton Khirnov
2934cd9dbf
asfdec: remove some commented-out cruft
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
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>
14 years ago
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
14 years ago
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
14 years ago
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
14 years ago
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
14 years ago