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

8317 Commits

Author SHA1 Message Date
Luca Barbato
28db30aa29 avf: fix audio writing in the output-example 
av_init_packet does not reset data and size fields in AVPacket,
avcodec_encode_audio2 can use preallocated AVPacket.
 2012-03-29 17:07:19 -07:00
Ronald S. Bultje
4f7c7624c0 mov: don't overwrite existing indexes. 
Prevents all kind of badness if files contain multiple
indexes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-29 11:36:14 -07:00
Kostya Shishkov
f704eb612b id3v2: add another mimetype for JPEG image 2012-03-29 15:49:06 +02:00
Ronald S. Bultje
44257ef426 asf: only set index_read if the index contained entries. 
This allows falling back to a binary search if the file contains no
index, thus fixing seeking in such files (e.g. luckynight.wma).
 2012-03-28 10:22:25 -07:00
Diego Biurrun
a92be9b856 Replace memset(0) by zero initializations. 
Also remove one pointless zero initialization in rangecoder.c.
 2012-03-28 09:38:33 +02:00
Justin Ruggles
eed691f7d1 oggdec: calculate correct timestamps in Ogg/FLAC 
We need to parse the individual packet durations when there is more than one
packet in a page.
 2012-03-27 16:11:06 -04:00
Paul B Mahol
55abaa58e5 westwood_vqa: fix SND0 chunk handling 
Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-03-27 11:58:15 -04:00
Paul B Mahol
f0a343f399 westwood_vqa: set video stream duration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-27 08:54:07 -07:00
Jindrich Makovicka
904100e5fc make av_interleaved_write_frame() flush packets when pkt is NULL 
This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-27 11:12:55 +03:00
Alex Converse
c9024a9fd7 mpegts: Fix dead error checks 2012-03-26 17:53:51 -07:00
Diego Biurrun
ad0e31f134 build: prettyprinting cosmetics 2012-03-26 13:00:10 +02:00
Anton Khirnov
967923abd1 lavf doxy: expand AVStream.codec doxy. 2012-03-26 10:59:43 +02:00
Anton Khirnov
e44ada129c lavf doxy: improve AVStream.time_base doxy. 
Remove confusing sentence that implied the user should set the timebase.
Elaborate on how the timebase is set for muxing.
 2012-03-26 10:59:43 +02:00
Anton Khirnov
f58b8cc3e3 lavf doxy: add some basic documentation about reading from the demuxer. 2012-03-26 10:59:43 +02:00
Anton Khirnov
10fa4ff7bc lavf doxy: document passing options to demuxers. 2012-03-26 10:59:43 +02:00
Anton Khirnov
dca9c81d82 lavf doxy: clarify that an AVPacket contains encoded data. 2012-03-26 10:59:42 +02:00
Jindrich Makovicka
3fadb29baf mpegtsenc: allow user triggered PES packet flushing 
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-26 11:41:18 +03:00
Martin Storsjö
68893afe1d movenc: Merge if statements 
This isn't exactly equivalent with the earlier code for codecs
other than H264 and VC1, but those are two only codecs supported
by this codepath anyway, and it simplifies it a bit.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-25 01:06:49 +02:00
Martin Storsjö
d5ed5e7d0c avc: Add a function for converting mp4 style extradata to annex b 
Make movenc use this function instead of the current custom
conversion function.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-24 22:53:18 +02:00
Martin Storsjö
e20ad71ebb libavformat: Document who sets the AVStream.id field 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-24 22:17:37 +02:00
Alex Converse
5023b89bba xwma: Validate channels and bits_per_coded_sample. 
This prevents a SIGFPE later on.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 13:57:12 -07:00
Alex Converse
86f2ae06b9 mov: Do not read past the end of the ctts_data table. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 13:57:12 -07:00
Alex Converse
3e6e89b3d6 mov: Add missing terminator to mov_ch_layout_map_1ch. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: Libav-stable@libav.org
 2012-03-22 13:56:44 -07:00
Ronald S. Bultje
e73c6aaabf asf: reset side data elements on packet copy. 
Prevents crash (double free) when free()ing the original packet.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Michael Niedermayer
f0b4a505d8 oggparseogm: fix order of arguments of avpriv_set_pts_info(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-22 19:51:43 +01:00
Justin Ruggles
f036342b4b aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C 2012-03-22 11:45:46 -04:00
Justin Ruggles
b38b7cc392 aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF 2012-03-22 11:45:46 -04:00
Justin Ruggles
2c07c18048 aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C 2012-03-22 11:45:46 -04:00
Justin Ruggles
02f88eec1d aiffdec: do not set bit rate if block duration is unknown 
CC: libav-stable@libav.org
 2012-03-22 11:45:36 -04:00
Anton Khirnov
a6733202cc lavf: make av_interleave_packet_per_dts() private. 
There is no reason for it to be public, it's only meant to be used
internally.
 2012-03-20 20:12:16 +01:00
Anton Khirnov
3c90cc2ef2 lavf: deprecate av_read_packet(). 
The caller can achieve the same effect (i.e. getting raw unparsed/mangled
packets) with av_read_frame() and AVFMT_FLAG_NOPARSE |
AVFMT_FLAG_NOFILLIN
 2012-03-20 20:12:16 +01:00
Justin Ruggles
f63412fc74 oggdec: output correct timestamps for Vorbis 
Takes encoder delay into account by comparing first the coded page
duration with the calculated page duration. Handles last packet duration
if needed, also by comparing coded duration with calculated duration.
Also does better handling of timestamp generation for packets in the
first page for streamed ogg files where the start time is not
necessarily zero.
 2012-03-20 14:39:57 -04:00
Justin Ruggles
777365fe86 xa: set correct bit rate 
Also fixes stream duration calculation.
 2012-03-20 14:12:54 -04:00
Justin Ruggles
a54bc52265 xa: do not set bit_rate, block_align, or bits_per_coded_sample 
The values in the header refer to decoded data, not compressed data.
 2012-03-20 14:12:53 -04:00
Justin Ruggles
64de57f645 xa: fix end-of-file handling 
Do not output an extra packet when out_size is reached.
Also return AVERROR_EOF instead of AVERROR(EIO).
 2012-03-20 14:12:53 -04:00
Justin Ruggles
cd2ffb67ad xa: fix timestamp calculation 
The packet duration is always 28 samples.
 2012-03-20 14:12:53 -04:00
Martin Storsjö
39f5a5462c movenc: Add a min_frag_duration option 
The other fragmentation options (frag_duration, frag_size and
frag_keyframe) are combined with OR, cutting fragments at the
first of the conditions being fulfilled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 11:18:05 +02:00
Martin Storsjö
ccfa8aa26f rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers 
This enables reordering of UDP packets by default, unless the caller
explicitly sets -max_delay 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:49 +02:00
Martin Storsjö
4fa57d524f libavformat: Set the default for the max_delay option to -1 
Make the muxers/demuxers that use the field handle the default
-1 in the same way as 0.

This allows distinguishing an intentionally set 0 from the default
value where the user hasn't set it.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-20 10:53:47 +02:00
Anton Khirnov
5626697104 Move AVFormatContext/AVCodecContext option tables to separate files. 
This will allow us to automatically generate manpages for them.
 2012-03-20 07:09:18 +01:00
Anton Khirnov
40b41be3fa lavf: use AVStream.discard to disable queueing attached pictures. 2012-03-20 06:53:44 +01:00
Anton Khirnov
01fcc42b90 lavf: requeue attached pictures after seeking. 
This allows the caller to get them without special code even after
seeking before receiving any data.
 2012-03-20 06:52:33 +01:00
Anton Khirnov
713f3062a7 id3v2: set the keyframe flag on attached pictures. 2012-03-20 06:52:07 +01:00
Derek Buitenhuis
0e714f889e ZeroCodec Decoder 
An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-03-19 19:02:23 +01:00
Kostya Shishkov
b8560637d9 RealAudio Lossless decoder 2012-03-19 18:46:34 +01:00
Martin Storsjö
316e724f18 rtpenc: Use AVFormatContext.packet_size instead of a private option 
The private option has not been part of any release yet (and
it is only of use in quite rare cases), so just remove it instead
of keeping it with deprecation warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 18:37:38 +02:00
Nicolas George
01b0ade665 url: Document the expected behaviour of url_read 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 16:25:51 +02:00
Martin Storsjö
57151f8674 libavformat: Use AVFormatContext.probesize in init_input 
This was forgotten in the transition from av_open_input_file to
avformat_open_input, see 603b8bc2a1.

This doesn't change anything for the default case where the
option isn't set, since PROBE_BUF_MAX is 1048576 (which was
used as max probe size earlier) while the default value for
the probesize option is 5000000, which for the probe function
is clipped to PROBE_BUF_MAX anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 16:08:08 +02:00
Martin Storsjö
17934c1824 cosmetics: Align some AVInput/OutputFormat declarations 
Also add missing trailing commas.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-03-19 14:27:43 +02:00
Michael Niedermayer
72ec043af4 oma: Fix out of array read. 
Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]

Fixes Bugzilla #106

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-18 15:01:58 -07:00