RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,848 Commits 36 Branches 398 Tags 228 MiB
Commit Graph

7366 Commits

Author SHA1 Message Date
Martin Storsjö f1f60f5252 lavf: Make make_absolute_url a lavf internal function 
This is shared by both applehttp demuxer and protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 12:28:37 +01:00
Martin Storsjö bc040cb3e2 applehttp: Fix a typo in a comment 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-17 11:20:21 +00:00
Stefano Sabatini 68d875addc lavf: make av_interleave_packet() return meaningful error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c5dcb3d493)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:30:09 +01:00
Stefano Sabatini 70abc32314 lavf: enable av_dlog message in av_interleaved_write_frame() 
Help debugging timestamp issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d541c8b468)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:29:57 +01:00
Stefano Sabatini 79f43a8cb6 lavf: enable av_dlog() in compute_pkt_fields2() 
Turns a comment into an av_dlog() instruction, also add a commented
issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77f21ce464)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:29:47 +01:00
Anton Khirnov b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov 35f1023592 avio: deprecate url_close_buf 
It's not used anywhere and its return value looks broken.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov 83fddaeb81 avio: deprecate url_open_buf 
It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov eda4cf92d7 avio: always compile avio_printf, rather than on CONFIG_MUXERS 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov d9d86e00b2 avio: avio_ prefix for url_fprintf 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov af02073225 avio: change avio_tell/skip from macros to inline functions 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov 59f65d9579 avio: make url_setbufsize internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Anton Khirnov 4839c192de lavf: move ff_get_v from avio.h to avio_internal.h 
And rename it to ffio_read_varlen.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Anton Khirnov 073f8b10d8 nutenc: mux chapters. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 03:34:16 +01:00
Anton Khirnov 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
Stefano Sabatini c5dcb3d493 lavf: make av_interleave_packet() return meaningful error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Stefano Sabatini 77f21ce464 lavf: enable av_dlog() in compute_pkt_fields2() 
Turns a comment into an av_dlog() instruction, also add a commented
issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Stefano Sabatini d541c8b468 lavf: enable av_dlog message in av_interleaved_write_frame() 
Help debugging timestamp issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Ramiro Polla cbf5d22d24 Remove occurrences of my old email address 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-16 23:19:40 +00:00
Aurelien Jacobs 6f1260f870 matroskadec: set a default duration also for packets comming from a simple block 2011-03-16 23:37:16 +01:00
Janne Grunau a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau 29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION 
also update the multiple inclusion guards in config.h|mak
 2011-03-16 21:54:39 +01:00
Ramiro Polla 57149a92f8 Remove occurrences of my old email address. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-16 20:07:38 +01:00
Anton Khirnov fed5676ffe mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead 
The two functions are identical, no point in duplicating code here.
 2011-03-16 10:20:24 -04:00
Kostya 8312e3fc90 Do not attempt to decode APE file with no frames 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
 2011-03-16 12:53:52 +01:00
Anton Khirnov 1dac4d5547 jvdec: don't use deprecated url_feof() 2011-03-16 12:24:23 +01:00
Kostya Shishkov 1c31b26bdf Do not attempt to decode APE file with no frames. 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
 2011-03-15 20:37:37 +01:00
Anton Khirnov 56e2ac6b45 id3v2: merge TYER/TDAT/TIME to date tag 2011-03-15 13:57:52 -04:00
Michael Niedermayer 6947b0c42e Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 16:48:42 +01:00
Nicolas George c76374c6db Use AVERROR_EXIT with url_interrupt_cb. 
Functions interrupted by url_interrupt_cb should not be restarted.
Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish
when the underlying system call was interrupted and actually needed to be
restarted.

This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed
content).

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-15 08:09:19 -04: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 75b9ed04b9 lavf/utils: dont't explicitly check AVIOContext.error 
The error should be caught in write_packet()/write_trailer()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-15 08:04:10 -04:00
Peter Ross 7f05c164d8 jv demuxer: prevent video packet size overflow 
In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-14 08:06:19 -04:00
Peter Ross 772cb06281 jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-14 08:05:54 -04:00
Peter Ross 20c1281fe3 jv demuxer: calculate palette_size for each frame in read_header 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-14 08:05:34 -04:00
Peter Ross bfaefd87dc Bitmap Brothers JV demuxer 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-14 08:05:02 -04:00
Peter Ross 435535e411 jv demuxer: prevent video packet size overflow 
In the event of overflow, the JV_PADDING state will avio_skip over
any overflow bytes (using JVFrame.total_size).
 2011-03-13 16:08:52 +11:00
Peter Ross 57d63d43cf jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-13 01:36:42 +01:00
Peter Ross 2f1084ca87 jv demuxer: calculate palette_size for each frame in read_header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-13 01:36:36 +01:00
Michael Niedermayer 3efbbbb509 Merge remote-tracking branch 'remotes/newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-11 15:00:52 +01:00
Marton Balint 5126a8ecbb Fix av_find_best_stream when providing a wanted stream 
In the main loop, stream_number is incremented after checking the stream type,
so the search usually will not find the wanted stream.

This patch eliminates the useless stream_number variable and introduces a new
one, called real_stream_index to store the real stream index of the current
stream, no matter if we are looping through all the streams or only the streams
of a program.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-11 13:05:46 +01:00
Marton Balint fa14610df5 Fix av_find_best_stream when decoder_ret is given and using a related stream 
Yet another fix for the code originally designed for use without related_stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-11 13:03:43 +01:00
Peter Ross 48e0d22251 Bitmap Brothers JV demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-11 12:25:47 +01:00
Michael Niedermayer 75a8e0f0ab Add avio_skip() 2011-03-11 12:25:44 +01:00
Benjamin Larsson 35d7d6f748 Add one more avc intra fourcc and extend the description 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-10 20:32:32 -05:00
Michael Niedermayer 3bd624b4ee Fix url_feof() for file appendings. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-10 16:26:48 +01:00
Anton Khirnov ffb0304593 id3v2: fix typo in error message 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fb61a7c534)
 2011-03-09 18:35:37 +01:00
Anton Khirnov fb61a7c534 id3v2: fix typo in error message 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-09 10:57:44 +00:00
Anssi Hannula b543e1dccf mpegts: add all stream languages into metadata 
This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6a7e074eb9)
 2011-03-08 02:09:45 +01:00
Baptiste Coudurier aa612fbb99 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems 
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 688c22e033)
 2011-03-08 02:09:44 +01:00
Hendrik Leppkes a2fc93f700 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>
(cherry picked from commit 789936dbbd)
 2011-03-08 02:09:44 +01:00
Anssi Hannula 70b5906315 mpegtsenc: handle multiple language tags per stream 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 435cebd015)
 2011-03-08 02:09:44 +01:00
Anton Khirnov f8bc86d47e 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>
(cherry picked from commit f1ef2cd9ed)
 2011-03-08 02:09:34 +01:00
Anton Khirnov 718975aa11 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>
(cherry picked from commit e8bb2e2439)
 2011-03-08 02:09:33 +01:00
Anssi Hannula c0fd48a702 lavf: document the use of multiple entries in language metadata tag 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c92562467e)
 2011-03-08 02:09:33 +01:00
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
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
Anssi Hannula 6a7e074eb9 mpegts: add all stream languages into metadata 
This is used at least on some older DVB broadcasts for dual-mono audio
tracks.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 15:00:53 -05:00
Baptiste Coudurier 688c22e033 In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems 
when writing and pressing q during encoding. Instead, check url_interrupt_cb
at the end.

Note that when a protocol is interrupted by url_interrupt_cb, some data may
be silently discarded: the protocol context is not suitable for anything
anymore.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-07 14:56:25 -05:00
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 0300db8ad7. 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 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
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 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
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 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
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 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
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
Martin Storsjö 28c4741a66 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>
 2011-02-23 07:21:31 -05:00
Benjamin Larsson 8f935b9271 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>
 2011-02-22 07:21:33 -05: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
Tony Strauss 6c065f0acd 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>
 2011-02-21 23:57:07 +00:00
Ronald S. Bultje 0f86fcabdf spdifenc.c: fix compile because of missing include avio_internal.h. 2011-02-21 15:49:24 -05:00
Anton Khirnov 0ac8e2bf2b avio: make put_nbyte internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-21 14:25:17 -05:00