generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56,008 Commits 24 Branches 241 Tags
Commit Graph

255 Commits

Author SHA1 Message Date
Michael Niedermayer
6947b0c42e Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 16:48:42 +01:00
Anton Khirnov
3e68b3ba7b avio: deprecate url_ferror 
AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-15 08:04:28 -04:00
Anton Khirnov
66e5b1df36 avio: deprecate url_feof 
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 17:20:31 -05:00
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 a2704c9712ad35cc22e7e0d8a79b581c07fa383b)
 2011-03-05 02:29:31 +01:00
Anton Khirnov
a2704c9712 avio: add avio_tell macro as a replacement for url_ftell 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:57 -05:00
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 e356fc57a2e9887370caec58d8aafeafd1f336dc)
 2011-03-03 14:15:08 +01:00
Anton Khirnov
f59d8ff8cd avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060)
 2011-03-03 14:15:03 +01:00
Anton Khirnov
e356fc57a2 lavf: replace all uses of url_fskip with avio_seek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:22:16 -05:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
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 b7effd4e8338f6ed5bda630ad7ed0809bf458648)
 2011-02-22 02:44:37 +01:00
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>
 2011-02-21 11:23:22 -05:00
Anton Khirnov
471fe57e1a avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
 2011-02-20 19:05:47 +01: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
Mans Rullgard
288b62b1b9 asfdec: fix build for big endian targets 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aabc2682fcb70417abda0e78d27a425269a82fc8)
 2011-02-14 23:58:21 +01:00
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 8bf6db1b29f3766732e2bb2bdd2681318fd8e215)
 2011-02-14 23:58:20 +01:00
Mans Rullgard
aabc2682fc asfdec: fix build for big endian targets 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-13 22:10:45 +00:00
Anton Khirnov
5cbd3b5d91 asfdec: don't export empty metadata 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-13 16:49:39 -05:00
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>
 2011-02-13 16:49:39 -05:00
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 0b1d291a716dd79ca6862a95baf9ac574feba885)
 2011-02-11 02:54:10 +01:00
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 c1fea2307011ac7a7bb98af98010f81abc789732)
 2011-02-11 02:54:10 +01:00
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 d7a5106eb2dad33765b0e5f11fd8b1a87e5a9b4b)
 2011-02-11 02:54:09 +01:00
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 7c7253802bbb4f7330ff9b32358bf05f9880cbdf)
 2011-02-11 02:54:09 +01:00
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 d42b09723ed154d5269b95efcc20cb1874f60816)
 2011-02-11 02:54:08 +01:00
Anton Khirnov
c3052f1dcc asfdec: remove some write-only values from the context 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 569ff02168dfe618599db5d5a327caf8b3051dd5)
 2011-02-11 02:54:08 +01:00
Anton Khirnov
83120e3bd7 asf: split ASFContext into muxer and demuxer parts. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4bc328a2bdf96d01afd3cf4532efb9db41f00985)
 2011-02-11 02:54:08 +01:00
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 e4e234fad77daa8628fc56155563248165d51ab4)
 2011-02-11 02:43:49 +01:00
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>
 2011-02-10 18:05:01 -05:00
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>
 2011-02-10 18:03:32 -05:00
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>
 2011-02-10 07:03:49 -05:00
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>
 2011-02-09 22:26:03 -05:00
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>
 2011-02-09 22:26:00 -05:00
Anton Khirnov
569ff02168 asfdec: remove some write-only values from the context 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-09 22:41:30 +00: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
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
 2011-01-30 03:41:48 +01:00
Anton Khirnov
8270482681 asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 042950542d6ee70fde01e4edbb6e6da38ebbaf27)
 2011-01-30 03:41:00 +01:00
Luca Barbato
dfd2a005eb Replace dprintf with av_dlog 
dprintf clashes with POSIX.1-2008
 2011-01-29 23:55:37 +01:00
Anton Khirnov
042950542d asfdec: ensure that the whole tag is read. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-28 21:33:45 +01:00
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 c6610a216ed2948885772154a2eed696e0cb4aca)
 2011-01-28 03:15:34 +01: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
24519edf64 asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2934cd9dbf390962ec008182f9eddd4296cf5527)
 2011-01-26 03:43:31 +01:00
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 93b78d12106112d7c5d9cfdcf96fc3dce9dc5f82)
 2011-01-26 03:43:31 +01:00
Anton Khirnov
2934cd9dbf asfdec: remove some commented-out cruft 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
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>
 2011-01-25 21:48:03 +01: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
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
 2010-12-18 13:18:52 +00:00
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
 2010-12-11 21:41:47 +00:00
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
 2010-12-11 21:39:08 +00:00
Stefan Gehrer
77b7c334be skip top-level objects to search for the simple index in ASF files 
Originally committed as revision 25863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-03 07:49:07 +00:00
Anton Khirnov
ad7768f4c4 add ff_ prefix to metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:20:41 +00:00