ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-26 16:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,855 Commits 37 Branches 398 Tags 539 MiB
e8a0c465bc
Commit Graph

7009 Commits

Author SHA1 Message Date
Peter Ross
21527d52f6 Add audio codec 0x1600 (ADTS AAC) 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d34ca1cfe3)
 2011-03-08 02:09:21 +01:00
Anton Khirnov
db44ea960d avio: avio_ prefix for url_fsize 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69)
 2011-03-08 02:09:21 +01:00
Anton Khirnov
1447dc59de avio: deprecate url_fgetc and remove all it uses 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e51975392d)
 2011-03-08 02:09:17 +01:00
Anton Khirnov
de3ef79250 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>
(cherry picked from commit 655e45e7df)
 2011-03-08 02:09:16 +01:00
Martin Storsjö
fb8d710fa9 Add Apple HTTP Live Streaming protocol handler 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f4f4e12c0d)
 2011-03-08 02:09:15 +01:00
Martin Storsjö
de0bddea29 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>
(cherry picked from commit 8f73c06077)
 2011-03-08 02:09:09 +01:00
Martin Storsjö
0ea285dd22 URLProtocol: Add a flags field 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f3bea9915f)
 2011-03-08 02:09:06 +01:00
Carl Eugen Hoyos
ac533ac458 Do not loop endlessly if id3v2 tag size is negative / too large. 
Fixes the sample from issue 2649.
 2011-03-07 23:32:26 +01:00
Carl Eugen Hoyos
2a8175ff9c Change filesize to int64_t. 2011-03-07 23:32:26 +01:00
Carl Eugen Hoyos
f8fab74996 Seek back to old position after reading id3v1 tag. 
FFmpeg did not seek back to the original position, but to "0", making
reading a VBR tag impossible.
(issue 2645)
 2011-03-07 23:32:26 +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 773947ba76.
 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 a2704c9712)
 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 e16ead0716)
 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 41d8555f72)
 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 fd085bc082)
 2011-03-05 02:29:24 +01: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 863c471638)
 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 e360ada2d1)
 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 06ed4873e6)
 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 fffdee89cc)
 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 0300db8ad7)
 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 e356fc57a2)
 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 6b4aa5dac8)
 2011-03-03 14:15:03 +01: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 13ff92d197)
 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 d184c86cd3)
 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 77d207cbe6)
 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 ea1afa124c)
 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 588a3ffd96)
 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 f0ca29eb5f)
 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 61840b4360)
 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 bbc413f943)
 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 99f42c27ab)
 2011-02-26 03:16:04 +01:00
Anton Khirnov
324429309e lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb29317)
 2011-02-26 03:16:04 +01:00
Anssi Hannula
a1c4b65b91 lavf: update documentation of AVOutputFormat.flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-24 20:00:23 +01:00
Anton Khirnov
374eb2bab6 lavf: postpone removal of deprecated avio functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-23 18:22:47 +01:00
Anton Khirnov
1f5e9ede23 lavf: postpone removal of public metadata conversion API 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-02-23 18:22:45 +01:00
longstone
4c262dc140 avienc: fix AVI stream index for files with >10 streams 
Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4acc94e97a)
 2011-02-23 18:22:03 +01:00
Anton Khirnov
ebb92e0768 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32)
 2011-02-23 18:22:03 +01:00
Martin Storsjö
c24a403496 libavformat: Remove FF_NETERRNO() 
Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR()
error codes. Provide fallback definitions of other errno.h network
errors, mapping them to the corresponding winsock errors.

This eases catching these error codes in common code, without having
to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN).

This fixes roundup issue 2614, unbreaking blocking network IO on
windows.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 28c4741a66)
 2011-02-23 18:22:03 +01:00
Benjamin Larsson
8e35f5d4fa Add more AVC Intra FOURCCs 
Also change the comments a bit since the FOURCCs aren't specific to Flip4Mac
and different ones are used for 720 versus 1080 lines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8f935b9271)
 2011-02-23 18:22:02 +01:00
Tony Strauss
352cb0da90 mpegtsenc: use correct PES stream_id for AAC 
This adds the AAC codec to the list of audio codecs that results
in a PES stream_id of 0xc0 (audio stream).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6c065f0acd)
 2011-02-22 02:44:39 +01:00
Ronald S. Bultje
51e7c932da spdifenc.c: fix compile because of missing include avio_internal.h. 
(cherry picked from commit 0f86fcabdf)
 2011-02-22 02:44:39 +01:00
Anton Khirnov
2df9d0008e avio: make put_nbyte internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0ac8e2bf2b)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
e9eb8d0bce avio: avio: avio_ prefixes for put_* functions 
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3)
 2011-02-22 02:44:38 +01:00
Anton Khirnov
d4e321d9c2 avio: make get_partial_buffer internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3db9ceef1)
 2011-02-22 02:44:37 +01: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 b7effd4e83)
 2011-02-22 02:44:37 +01:00
Anton Khirnov
90ed2776ea avio: rename av_alloc_put_byte -> avio_alloc_context for consistency 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8d9ac969cb)
 2011-02-22 02:44:36 +01:00