0fecf2642b
Merge remote-tracking branch 'newdev/master'
...
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2011-03-17 17:22:52 +01:00
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-16 22:24:51 -04:00
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
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
2011-03-05 02:29:31 +01:00
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
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
2011-03-03 14:15:08 +01:00
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 6b4aa5dac8
2011-03-03 14:15:03 +01:00
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
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-03-01 12:12:33 -05:00
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
2011-02-22 02:44:37 +01:00
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
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit ae628ec1fd
2011-02-20 19:05:47 +01:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-20 08:37:15 -05:00
f81946729e
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 19711af5cd
2011-02-09 03:31:17 +01:00
19711af5cd
lavf: move internal functions from avformat.h to internal.h
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2011-02-06 16:35:00 -05:00
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
2011-01-28 03:15:34 +01:00
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
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
612dc0238a
Skip pes payload during probing to avoid start code emulation.
...
Patch by Janne Grunau, janne-ffmpeg jannau net
Originally committed as revision 23286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 12:32:13 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
0332324a48
Dont give up after 100kb of zero bytes but returnd EAGAIN
...
fixes issue1729
Originally committed as revision 21738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-10 14:25:57 +00:00
c45ebd5461
Set AVPacket.pos in MPEG-PS demuxer.
...
Originally committed as revision 21604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:47:51 +00:00
6de5b62790
Also print the number of invalid packets in the debug output.
...
Originally committed as revision 20763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:24:41 +00:00
55f6524789
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
...
been wrong.
Fixes issue1571.
Originally committed as revision 20762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:19:30 +00:00
711e69a730
Improve sofdec dectection to avoid false positives for MP2.
...
Patch by tralph11, tralph11 yahoo
Originally committed as revision 20333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-20 15:27:05 +00:00
c4674a479b
Make mpeg_probe() pass probetest.
...
Originally committed as revision 19854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 12:20:03 +00:00
3489e150d9
Slightly stricter MPEG-PES probing, fixes issue 1383.
...
Originally committed as revision 19852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 10:01:25 +00:00
e8c9383914
Remove 2 ++ from check_pes() that are useless, found by CSA.
...
Originally committed as revision 18577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 18:08:39 +00:00
9ba4821d93
Split TrueHD decoder from MLP
...
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:23:39 +00:00
1aeb55a1de
Mark dvdaudio_substream_type variable as av_uninit to work around false
...
positive uninitialized variable warning.
Originally committed as revision 17825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-05 19:13:12 +00:00
80e58c6153
Allow demuxing of audio substreams stored as 0x06 type.
...
Fixes issue 725: MPEG2 PS with PCM audio.
On behalf of Jai.
Originally committed as revision 17150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 11:09:36 +00:00
d84d6fbf28
Increase the number of packets required to identify as MPEG PES to keep from
...
identifying MP3 files with padding or garbage at the beginning.
Originally committed as revision 17091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 01:46:01 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
fb65d2ca84
Use enum typers instead of int.
...
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail
Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +00:00
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
274335e76c
vertical align
...
Originally committed as revision 14972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 01:29:43 +00:00
ff9c8d7c6f
Add flag to mark demuxers that can output discontinuous timestamps.
...
(could also be added to muxers if someone wants)
Originally committed as revision 14777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:13:05 +00:00
c1c9046656
Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
...
video codec is used.
Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)
Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 22:17:13 +00:00
9b64a036c0
remove useless close funcs
...
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 23:25:04 +00:00
bde15e74de
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
5faf168940
Check return of url_fseek in mpeg timestamp reading code.
...
Patch by Joakim elupus ecce se
Originally committed as revision 13527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 09:50:17 +00:00
4860abb116
support dvd pcm 20/24 bits, patch by Lars Täuber, lars.taeuber gmx net
...
Originally committed as revision 13206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 02:26:42 +00:00
b22d0c04d7
Support invalid mpeg created by vdr
...
(http://www.lucke.in-berlin.de/test_streams/last_played_fine_with_r7852_001.vdr ).
fixes issue434
Originally committed as revision 13014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 00:12:49 +00:00
675b8390f6
Ignore flags after pts/dts if there are no bytes left.
...
Fixes decoding of vdr-radio.vdr. (issue198)
Originally committed as revision 12310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 01:31:15 +00:00
6ba90c204c
Suppress runaway index on streamed input
...
Originally committed as revision 11527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-14 16:11:08 +00:00
3dea63bd7e
user specifyable maximum amount of memory to use for the index.
...
patch by Paul Kelly paul stjohnspoint co uk
with some changes by me
Originally committed as revision 11521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-13 13:33:37 +00:00
66e9e30239
Move parsing of MPEG-PES timestamp to mpeg.h (as an inline function) so it
...
can easily be reused by other demuxers for formats that encapsulate MPEG-PES.
Originally committed as revision 11451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-07 23:32:57 +00:00
3d94e3ba93
use one shift less in get_pts()
...
Originally committed as revision 11383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-03 10:02:46 +00:00
7dc75e8d43
Revert r6124, the change was just wrong, other formats than MPEG-PS can be
...
stored in CDXA as well. And the need for a CDXA specific check is questionable.
Also ive ok-ed that patch instead of mans ...
fixes issue287 (psxstr misdetection as MPEG-PS)
Original commit message:
add support for information in CDXA format
patch by Allan Sandfeld Jensen % kde A carewolf P com %
Original thread:
Date: Aug 18, 2006 6:33 PM
Subject: [Ffmpeg-devel] CDXA in libavformat [patch]
Originally committed as revision 11314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-25 09:37:49 +00:00
7e1720dec6
make mpeg-ps probe less happy with random data
...
fixes missdetection of O-MP3-5.mp3
Originally committed as revision 11149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 09:37:06 +00:00
