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

7278 Commits

Author SHA1 Message Date
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
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 0abdb2931719d96dee725e555e9b46b2b2f8a6be)
 2011-02-26 03:16:04 +01:00
Ronald S. Bultje
13ff92d197 movenc: remove uses of deprecated API. 
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
 2011-02-25 17:41:00 -05:00
Maksym Veremeyenko
d184c86cd3 store pasp atom for all types of quicktime movie 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Maksym Veremeyenko
77d207cbe6 reindent after tapt patch 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Maksym Veremeyenko
ea1afa124c use tapt atom for sample aspect ratio 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Peter Ross
588a3ffd96 bink: decode audio track identifiers into AVStream.id 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 15:24:35 -05:00
Peter Ross
f0ca29eb5f bink: set audio stream codec_tag such that binkaudio decoder can identify bitstream version 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 15:24:35 -05:00
Anton Khirnov
61840b4360 avio: deprecate put_tag 
it's not used internally anymore and shouldn't be public.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:57 -05:00
Anton Khirnov
bbc413f943 lavf: replace remaining uses of put_tag with avio_write 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:56 -05:00
Anton Khirnov
99f42c27ab avienc: replace &tag[0] with tag. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:55 -05:00
Anton Khirnov
0abdb29317 lavf: use a new ffio_wfourcc macro instead of put_tag() where possible 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-25 14:38:22 -05: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 4acc94e97a9551d11ead29735e23283d71f1d4c2)
 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 22a3212e32b696028e21f00871f3cb48c044029d)
 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 28c4741a6617a4c1d2490cb13fc70ae4c9c472da)
 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 8f935b9271052be8f97d655081b94b68b6c23bfb)
 2011-02-23 18:22:02 +01:00
longstone
4acc94e97a avienc: fix AVI stream index for files with >10 streams 
Fixes issue 2563.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:44:26 -05:00
Anton Khirnov
22a3212e32 avio: rename url_fopen/fclose -> avio_open/close. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 10:18:55 -05:00