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

7244 Commits

Author SHA1 Message Date
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
Aurelien Jacobs 6f1260f870 matroskadec: set a default duration also for packets comming from a simple block 2011-03-16 23:37:16 +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
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
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