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

7548 Commits

Author SHA1 Message Date
Hendrik Leppkes
789936dbbd Flag DVB subtitles for the hard hearing appropriately using their component_type id. 
This is based on the component_type definition in the DVB SI spec [1].

[1]: http://www.dvb.org/technology/standards/a038_DVB-SI_dEN300468v1.12.1.pdf

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 14:44:29 -05:00
Anssi Hannula
435cebd015 mpegtsenc: handle multiple language tags per stream 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 14:43:03 -05:00
Anssi Hannula
89e568feec lavf: update documentation of AVOutputFormat.flags 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 14:34:32 -05:00
Anton Khirnov
f1ef2cd9ed avio: move ff_rewind_with_probe_data from avio.h to avio_internal.h 
also change its prefix to ffio

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Anton Khirnov
e8bb2e2439 avio: deprecate url_fget_max_packet_size 
AVIOContext.max_packet_size should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Anssi Hannula
c92562467e lavf: document the use of multiple entries in language metadata tag 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 12:25:36 -05:00
Peter Ross
d34ca1cfe3 Add audio codec 0x1600 (ADTS AAC) 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:11:01 -05:00
Anton Khirnov
76aa876e69 avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 11:03:39 -05:00
Anton Khirnov
e51975392d avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:51:21 -05:00
Anton Khirnov
655e45e7df avio: deprecate url_fgets 
It's not used anywhere and doesn't look ver useful to be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:19:46 -05:00
Peter Ross
2af07d36fc avio: add avio_skip macro 
This is a substitute for the url_fskip function that was deprecated by
commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee. avio_fskip is provided to
improve demuxer code readability. It distinguishes the act of skipping over
unknown or irrelevant bytes from the standard avio_seek operation.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 10:19:46 -05:00
Martin Storsjö
f4f4e12c0d Add Apple HTTP Live Streaming protocol handler 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-06 23:29:39 +01:00
Martin Storsjö
8f73c06077 URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME 
If this flag is set, the protocol can handle URLs where the
scheme is a nested scheme such as applehttp+file: - the protocol
can handle any URL where the first segment of the nested scheme
belongs to this protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-06 23:29:39 +01:00
Martin Storsjö
f3bea9915f URLProtocol: Add a flags field 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-06 23:29:39 +01:00
Michael Niedermayer
4118d66cb3 Revert "lavf: deprecate get_strz() in favor of avio_get_str" 
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.
 2011-03-06 02:16:00 +01:00
Reimar Döffinger
b09e506820 Make matroska demuxer also set timestamps for RealAudio packets. 
Improves seeking in ffplay with
http://samples.mplayerhq.hu/Matroska/RA_missing_timestamps.mkv
 2011-03-05 12:48:39 +01: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
773947ba76 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716c2f988d1e26369a4c67b354ff86134)
 2011-03-05 02:29:28 +01:00
Reimar Döffinger
3e1a8e1ec1 avio: add avio_get_str() 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 41d8555f72e3bc60cf93af2a1a4786b452fd2736)
 2011-03-05 02:29:28 +01:00
Ronald S. Bultje
a960576f20 avio: fix fourcc if any character is >=0x80. 
Fixes issue 2638.
(cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1)
 2011-03-05 02:29:24 +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
e16ead0716 lavf: deprecate get_strz() in favor of avio_get_str 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:26:02 -05:00
Reimar Döffinger
41d8555f72 avio: add avio_get_str() 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-04 11:24:58 -05:00
Ronald S. Bultje
fd085bc082 avio: fix fourcc if any character is >=0x80. 
Fixes issue 2638.
 2011-03-04 08:33:49 -05:00
Baptiste Coudurier
08c866345c In retry_transfer_wrapper, do not check url_interrupt_cb, 
causes problems when writing and pressing q during encoding.
 2011-03-03 19:34:59 -08:00
Martin Storsjö
08ad81cbff libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter 
This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 863c471638fa667e6e5c5df059b67af263e1cd40)
 2011-03-03 14:15:10 +01:00
Martin Storsjö
62d0a7453a aviobuf: Write new data at s->buf_end in fill_buffer 
In most cases, s->buf_ptr will be equal to s->buf_end when
fill_buffer is called, but this may not always be the case, if
we're seeking forward by reading (permitted by the short seek
threshold).

If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when
they aren't equal and s->buf_ptr is ahead of s->buffer), the data
between s->buf_ptr and s->buf_end is overwritten, leading to
inconsistent buffer content. This could return incorrect data if
later seeking back into the area before the current s->buf_ptr.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit e360ada2d13af36ab7afd9ebcd2bd236d23d9b96)
 2011-03-03 14:15:09 +01:00
Baptiste Coudurier
cd37308b77 movenc: use correct tag for dvcpro hd 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 06ed4873e6e6aed8ec7cc24285d610ef4060880e)
 2011-03-03 14:15:09 +01:00
Baptiste Coudurier
5bb50c71a3 movenc: fix tkhd height for imx 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fffdee89cc0712ed3324bae1f86e271a36c02822)
 2011-03-03 14:15:09 +01:00
Anton Khirnov
813cc7abaf avio: deprecate url_fskip 
avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0300db8ad778a194b4a8ec98f6da3de5b41c46ee)
 2011-03-03 14:15:09 +01: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
Martin Storsjö
863c471638 libavformat: Add av_pkt_dump{, _log}2, taking an AVStream parameter 
This removes a fixme issue, by allowing the av_pkt_dump functions
to use the correct time base.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-02 11:29:38 +01:00
Martin Storsjö
e360ada2d1 aviobuf: Write new data at s->buf_end in fill_buffer 
In most cases, s->buf_ptr will be equal to s->buf_end when
fill_buffer is called, but this may not always be the case, if
we're seeking forward by reading (permitted by the short seek
threshold).

If fill_buffer is writing to s->buf_ptr instead of s->buf_end (when
they aren't equal and s->buf_ptr is ahead of s->buffer), the data
between s->buf_ptr and s->buf_end is overwritten, leading to
inconsistent buffer content. This could return incorrect data if
later seeking back into the area before the current s->buf_ptr.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-02 11:16:17 +01:00
Baptiste Coudurier
06ed4873e6 movenc: use correct tag for dvcpro hd 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-02 00:23:08 +00:00
Baptiste Coudurier
fffdee89cc movenc: fix tkhd height for imx 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-01 23:45:03 +00:00
Anton Khirnov
0300db8ad7 avio: deprecate url_fskip 
avio_seek should be used instead

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:27:08 -05: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
Baptiste Coudurier
65ad2c618f In mov muxer, fix adpcm mono muxing, patch by Alex Converse 2011-02-27 16:29:21 -08:00
Baptiste Coudurier
4ea02a9a71 In mpegts demuxer, do not output known sized packet if an unbounded packet 
is already queued. Fix issue #2624.
 2011-02-27 16:20:00 -08:00
Ronald S. Bultje
4e815a8b60 movenc: remove uses of deprecated API. 
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
(cherry picked from commit 13ff92d19706d17f876ff676591dace0b3e34794)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
aaa71a3e1d store pasp atom for all types of quicktime movie 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d184c86cd309bbd61c5d1a1dfcf60d133da4c1e3)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
eea040212c reindent after tapt patch 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77d207cbe64710b7b34865f347e608b9c0e15968)
 2011-02-26 03:16:09 +01:00
Maksym Veremeyenko
3b2c4ce140 use tapt atom for sample aspect ratio 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ea1afa124cb58c7eebd4fd3706434fafb58b00c0)
 2011-02-26 03:16:09 +01:00
Peter Ross
6a22f82cc6 bink: decode audio track identifiers into AVStream.id 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 588a3ffd9687cbef60cc26d5b3a247b8ecdbf75b)
 2011-02-26 03:16:09 +01:00
Peter Ross
777b365c8b bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f0ca29eb5f476a281c8066214e3745244656d417)
 2011-02-26 03:16:06 +01:00
Anton Khirnov
3308ddfb36 avio: deprecate put_tag 
it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 61840b43607679e8c4a1a63f005770f69dda12fa)
 2011-02-26 03:16:05 +01:00
Anton Khirnov
a1b7979261 lavf: replace remaining uses of put_tag with avio_write 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit bbc413f943b53d96aa85fe272ec413c85794019f)
 2011-02-26 03:16:05 +01:00
Anton Khirnov
eac4e4d9a5 avienc: replace &tag[0] with tag. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 99f42c27abfe916fa19ac0c18489c8bbf8525406)
 2011-02-26 03:16:04 +01:00