]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 10 Jan 2013 12:07:19 +0000 (13:07 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec_vp8: Don't trim too much data from broken frames
rtpdec_vp8: Simplify code by using an existing helper function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 10 Jan 2013 12:00:19 +0000 (13:00 +0100)]
Do not allow arbitrary packet size in aac decoder.
Fixes a crash with a file containing a 400MB packet reported in bug 420.
Michael Niedermayer [Thu, 10 Jan 2013 11:56:58 +0000 (12:56 +0100)]
Merge commit '
ed79093222ceb42f0c3a39095a69af0b32be5450 '
* commit '
ed79093222ceb42f0c3a39095a69af0b32be5450 ':
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
yuv4mpeg: do not use deprecated functions
oggdec: fix faulty cleanup prototype
idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:52:02 +0000 (12:52 +0100)]
Merge commit '
5d0450461ff729be5f531d333d29754155e406c5 '
* commit '
5d0450461ff729be5f531d333d29754155e406c5 ':
idcin: better error handling
idcin: check for integer overflow when calling av_get_packet()
Conflicts:
libavformat/idcin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:45:42 +0000 (12:45 +0100)]
Merge commit '
7040e479a1530b2eda4b89a182d5eb50a77bd907 '
* commit '
7040e479a1530b2eda4b89a182d5eb50a77bd907 ':
idcin: allow seeking back to the first packet
idcin: set AV_PKT_FLAG_KEY for video packets with a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:40:38 +0000 (12:40 +0100)]
Merge commit '
ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb '
* commit '
ccc0ffb1ba3fc1adb05a9f56dfc26131e61db3fb ':
idcin: set start_time and packet duration instead of manually tracking pts.
idcin: set channel_layout
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:33:45 +0000 (12:33 +0100)]
Merge commit '
12c2530b1d87fa94f81ea97df575b77c825e6f4f '
* commit '
12c2530b1d87fa94f81ea97df575b77c825e6f4f ':
idcin: fix check for presence of an audio stream
idcin: validate header parameters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:26:28 +0000 (12:26 +0100)]
Merge commit '
f7bf72a4a1146a7583577c9bdc066767e1ba3c6a '
* commit '
f7bf72a4a1146a7583577c9bdc066767e1ba3c6a ':
idcinvideo: correctly set AVFrame defaults
yadif: Port inline assembly to yasm
au: remove unnecessary casts
au: return AVERROR codes instead of -1
Conflicts:
libavcodec/idcinvideo.c
libavfilter/x86/yadif_template.c
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:15:21 +0000 (12:15 +0100)]
Merge commit '
fd9147f11456a7e39a998d7270684922a2a46e6d '
* commit '
fd9147f11456a7e39a998d7270684922a2a46e6d ':
au: cosmetics: pretty-print and remove pointless comments
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 11:02:58 +0000 (12:02 +0100)]
Merge commit '
c88d245c9866e48cb8a238b7564964c1fcf3315f '
* commit '
c88d245c9866e48cb8a238b7564964c1fcf3315f ':
au: use ff_raw_write_packet()
au: set stream start time and packet durations
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 10:20:58 +0000 (11:20 +0100)]
Merge commit '
af68a2baae6761044cbed95575e8bcfebf55c6f1 '
* commit '
af68a2baae6761044cbed95575e8bcfebf55c6f1 ':
au: use %u when printing id and channels since they are unsigned
au: validate sample rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 10:12:08 +0000 (11:12 +0100)]
Merge commit '
c837b38dd33a11c3810e988a60193a858eb4f58c '
* commit '
c837b38dd33a11c3810e988a60193a858eb4f58c ':
au: move skipping of unused data to before parameter validation
au: do not arbitrarily limit channel count
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
André Pankratz [Thu, 10 Jan 2013 09:37:49 +0000 (10:37 +0100)]
lavfi/yadif: fix shorthand/option mismatch
Fix trac ticket #2128.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Thu, 10 Jan 2013 09:42:34 +0000 (10:42 +0100)]
Merge commit '
2613de88051818abafccb98646394341887acb3a '
We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.
* commit '
2613de88051818abafccb98646394341887acb3a ':
au: do not set pkt->size directly
au: set block_align and use it in au_read_packet()
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 09:18:35 +0000 (10:18 +0100)]
Merge commit '
9a7b56883d1333cdfcdf0fa7584a333841b86114 '
* commit '
9a7b56883d1333cdfcdf0fa7584a333841b86114 ':
au: set bit rate
au: validate bits-per-sample separately from codec tag
rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT
Conflicts:
libavformat/au.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 10 Jan 2013 09:04:46 +0000 (10:04 +0100)]
Fix compilation with --disable-everything.
Martin Storsjö [Wed, 9 Jan 2013 12:25:59 +0000 (14:25 +0200)]
rtpdec_vp8: Don't trim too much data from broken frames
Previously, for broken frames, we only returned the first partition
of the frame (we would append all the received packets to the packet
buffer, then set pkt->size to the size of the first partition, since
the rest of the frame could have lost data inbetween) - now instead
return the full buffered data we have, but don't append anything more
to the buffer after the lost packet discontinuity. Decoding the
truncated packet should hopefully get better quality than trimming out
everything after the first partition.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 9 Jan 2013 12:25:22 +0000 (14:25 +0200)]
rtpdec_vp8: Simplify code by using an existing helper function
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 9 Jan 2013 17:41:21 +0000 (19:41 +0200)]
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
This is required by RFC 3550 (section 6.5):
The list of items in each chunk MUST be terminated by one or more
null octets, the first of which is interpreted as an item type of
zero to denote the end of the list.
This was implicitly added as padding before, unless the host name
length matched up so no padding was added.
This makes wireshark parse the packets properly if other RTCP items
are appended to the same packet.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 10 Jan 2013 03:50:33 +0000 (04:50 +0100)]
wmalosslessdec: make arrays indexed by ch large enough for maximum number of channels
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 03:37:45 +0000 (04:37 +0100)]
targa: use checked bytestream read
Fix out of array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 03:23:14 +0000 (04:23 +0100)]
qdm2: fix out of stack array read.
The read value is not used when its outside the array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Jan 2013 00:28:24 +0000 (01:28 +0100)]
swr: scale data down in noise shaping to avoid cliping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 23:27:04 +0000 (00:27 +0100)]
swr: reorder the operations in the noise shaping code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 23:25:09 +0000 (00:25 +0100)]
swr: add noise_scale field to seperate it from the noise shaping scales
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 22:20:24 +0000 (23:20 +0100)]
swr: fix the noise sample type for noise shaping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 21:46:32 +0000 (22:46 +0100)]
swr: split swri_dither_init() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 19:12:50 +0000 (20:12 +0100)]
doc: add noise shaping dithers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 9 Jan 2013 22:13:40 +0000 (23:13 +0100)]
Add -movflags rtphint documentation.
Luca Barbato [Wed, 9 Jan 2013 19:50:06 +0000 (20:50 +0100)]
yuv4mpeg: do not use deprecated functions
Use the libavutil replacement.
Luca Barbato [Wed, 9 Jan 2013 19:49:34 +0000 (20:49 +0100)]
oggdec: fix faulty cleanup prototype
Justin Ruggles [Wed, 1 Aug 2012 21:16:58 +0000 (17:16 -0400)]
idcin: better error handling
Add some additional checks for EOF and print error messages on an incomplete
header or packet.
FATE reference updated for id-cin-video due to the demuxer no longer
returning a partial video packet at EOF.
Justin Ruggles [Wed, 1 Aug 2012 20:13:04 +0000 (16:13 -0400)]
idcin: return 0 from idcin_read_packet() on success.
This matches the AVInputFormat.read_packet() API.
Justin Ruggles [Wed, 1 Aug 2012 21:14:39 +0000 (17:14 -0400)]
idcin: allow seeking back to the first packet
Also, do not allow seek-by-byte, as there is no way to find the next packet
boundary.
Justin Ruggles [Wed, 1 Aug 2012 20:06:23 +0000 (16:06 -0400)]
idcin: set start_time and packet duration instead of manually tracking pts.
Also, use 1 / sample_rate for audio stream time_base.
Justin Ruggles [Wed, 1 Aug 2012 19:57:31 +0000 (15:57 -0400)]
idcin: fix check for presence of an audio stream
Justin Ruggles [Wed, 1 Aug 2012 19:46:08 +0000 (15:46 -0400)]
idcinvideo: correctly set AVFrame defaults
Justin Ruggles [Wed, 1 Aug 2012 20:10:08 +0000 (16:10 -0400)]
idcin: check for integer overflow when calling av_get_packet()
chunk_size is unsigned 32-bit, but av_get_packet() takes a signed int as the
packet size.
Justin Ruggles [Wed, 1 Aug 2012 20:08:28 +0000 (16:08 -0400)]
idcin: set AV_PKT_FLAG_KEY for video packets with a palette
Justin Ruggles [Wed, 1 Aug 2012 19:59:12 +0000 (15:59 -0400)]
idcin: set channel_layout
Justin Ruggles [Wed, 1 Aug 2012 19:53:20 +0000 (15:53 -0400)]
idcin: validate header parameters
Avoids using unsupported parameters and signed integer overflows.
Michael Niedermayer [Wed, 9 Jan 2013 17:41:40 +0000 (18:41 +0100)]
swr: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 17:41:12 +0000 (18:41 +0100)]
swr: move dither related fields to their own context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Kang [Wed, 9 Jan 2013 15:34:46 +0000 (09:34 -0600)]
yadif: Port inline assembly to yasm
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Wed, 9 Jan 2013 17:30:01 +0000 (18:30 +0100)]
swr: update copyright years of a few files iam working on
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 17:03:49 +0000 (18:03 +0100)]
swr: Implement Noise shaping dither
The following variants are implemented:
lipshitz noise shaping dither
shibata noise shaping dither
low shibata noise shaping dither
high shibata noise shaping dither
f-weighted noise shaping dither
modified-e-weighted noise shaping dither
improved-e-weighted noise shaping dither
Data tables taken from SOX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sun, 23 Dec 2012 20:03:08 +0000 (15:03 -0500)]
au: cosmetics: pretty-print and remove pointless comments
Justin Ruggles [Sun, 23 Dec 2012 19:14:38 +0000 (14:14 -0500)]
au: use ff_raw_write_packet()
Justin Ruggles [Sun, 23 Dec 2012 18:39:47 +0000 (13:39 -0500)]
au: use %u when printing id and channels since they are unsigned
Justin Ruggles [Sun, 23 Dec 2012 18:33:33 +0000 (13:33 -0500)]
au: move skipping of unused data to before parameter validation
Also do not unnecessarily skip 0 bytes.
Justin Ruggles [Sun, 23 Dec 2012 18:21:27 +0000 (13:21 -0500)]
au: do not set pkt->size directly
It is already set by av_get_packet() even for partial reads.
Justin Ruggles [Sun, 23 Dec 2012 20:09:37 +0000 (15:09 -0500)]
au: remove unnecessary casts
Justin Ruggles [Sun, 23 Dec 2012 19:12:28 +0000 (14:12 -0500)]
au: set stream start time and packet durations
Justin Ruggles [Sun, 23 Dec 2012 18:39:31 +0000 (13:39 -0500)]
au: validate sample rate
Justin Ruggles [Sun, 23 Dec 2012 18:26:44 +0000 (13:26 -0500)]
au: do not arbitrarily limit channel count
Nothing in the AU specification sets a limit on channel count.
We only need to avoid an overflow in the packet size calculation.
Justin Ruggles [Sun, 23 Dec 2012 20:06:46 +0000 (15:06 -0500)]
au: return AVERROR codes instead of -1
Justin Ruggles [Sun, 23 Dec 2012 18:19:31 +0000 (13:19 -0500)]
au: set bit rate
Justin Ruggles [Sun, 23 Dec 2012 18:20:59 +0000 (13:20 -0500)]
au: set block_align and use it in au_read_packet()
Justin Ruggles [Sun, 23 Dec 2012 18:17:05 +0000 (13:17 -0500)]
au: validate bits-per-sample separately from codec tag
Peter Ross [Mon, 7 Jan 2013 11:08:39 +0000 (22:08 +1100)]
frmdec: tag 5 is AV_PIX_FMT_BGRA with reversed alpha (0=solid/opaque .. 255=transparent)
Michael Niedermayer [Wed, 9 Jan 2013 11:30:14 +0000 (12:30 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xan: Convert to bytestream2
oggenc: add a page_duration option and deprecate the pagesize option
x86: lavr: add SSE2/AVX dither_int_to_float()
Conflicts:
libavcodec/xan.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 11:13:58 +0000 (12:13 +0100)]
Merge commit '
1fb8f6a44f06e48386450fe0363aefc02583d24a '
* commit '
1fb8f6a44f06e48386450fe0363aefc02583d24a ':
x86: lavr: add SSE2 quantize() for dithering
doc/APIchanges: fill in missing dates and hashes.
rtpdec_vp8: Request a keyframe if RTP packets are lost
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 10:48:14 +0000 (11:48 +0100)]
Merge commit '
86d9181cf41edc3382bf2481f95a2fb321058689 '
* commit '
86d9181cf41edc3382bf2481f95a2fb321058689 ':
rtpdec: Support sending RTCP feedback packets
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 10:41:56 +0000 (11:41 +0100)]
Merge commit '
42805eda554a7fc44341282771531e7837ac72b7 '
* commit '
42805eda554a7fc44341282771531e7837ac72b7 ':
rtpdec: Store the dynamic payload handler in the rtpdec context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 10:35:46 +0000 (11:35 +0100)]
Merge commit '
9c80ed836a511293f4cc3a858060969d32f2b1ce '
* commit '
9c80ed836a511293f4cc3a858060969d32f2b1ce ':
rtpdec_vp8: Avoid a warning about a possibly unused variable
rtpdec_vp8: Make sure the previous packet is returned
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Jan 2013 10:26:31 +0000 (11:26 +0100)]
Merge commit '
92e354b655613b88c3c202a7e19e7037daed37eb '
* commit '
92e354b655613b88c3c202a7e19e7037daed37eb ':
rtpdec_vp8: Set the timestamp when returning a deferred packet
hlsenc: Make the start_number option set the right variable
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 8 Jan 2013 21:21:15 +0000 (23:21 +0200)]
rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT
This allows the caller to either include them (and get more packets
decoded, but possibly some nonperfect frames), or discard them (by
setting fflags=discardcorrupt).
Signed-off-by: Martin Storsjö <martin@martin.st>
Alexandra Khirnova [Tue, 8 Jan 2013 20:47:20 +0000 (21:47 +0100)]
xan: Convert to bytestream2
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 9 Jan 2013 01:05:35 +0000 (02:05 +0100)]
swr: use SIMD for dithering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 23:43:31 +0000 (00:43 +0100)]
dirac: fix inverted check
Regression since:
ea6da80
Fixes Ticket2123
I cannot reproduce any regressions by flipping the wrong condition
to how it should have been.
Thanks-to: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 8 Jan 2013 21:39:25 +0000 (22:39 +0100)]
lavf/mux: do not pass a copy of the packet to write_packet().
Sometimes the muxer modifies the packet, like for instance lavf/mp3enc
changing pkt->destruct in order to keep a copy. These changes must be
kept, even though the muxer behaviour is questionable. Regression since
0072116 .
Fixes #2124.
Justin Ruggles [Sun, 30 Dec 2012 22:00:00 +0000 (17:00 -0500)]
oggenc: add a page_duration option and deprecate the pagesize option
This uses page duration instead of byte size to determine when to buffer
the page. Also, it tries to avoid continued pages by buffering the current
page if there are already packets in the page and adding the next packet
would require it to be continued on a new page. This can improve seeking
performance.
The default page duration is 1 second, which is much saner than filling
all page segments by default.
Justin Ruggles [Wed, 31 Oct 2012 19:40:12 +0000 (15:40 -0400)]
x86: lavr: add SSE2 quantize() for dithering
Justin Ruggles [Wed, 31 Oct 2012 19:40:12 +0000 (15:40 -0400)]
x86: lavr: add SSE2/AVX dither_int_to_float()
Justin Ruggles [Tue, 8 Jan 2013 03:04:30 +0000 (22:04 -0500)]
doc/APIchanges: fill in missing dates and hashes.
Michael Niedermayer [Tue, 8 Jan 2013 16:17:31 +0000 (17:17 +0100)]
ffmpeg: fix dither to 24bit PCM output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 15:55:46 +0000 (16:55 +0100)]
swr: fix assertion failure if dither is used without the preout buffer differing from in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 19:06:09 +0000 (20:06 +0100)]
img2dec: fix -loop
This fixes a infinite loop with -loop and -vframes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 8 Jan 2013 18:59:13 +0000 (19:59 +0100)]
Fix compilation with --disable-everything --enable-decoder=dirac.
Paul B Mahol [Tue, 8 Jan 2013 18:47:09 +0000 (18:47 +0000)]
fate: upate after
55d32eed8f
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Tue, 11 Dec 2012 14:03:33 +0000 (16:03 +0200)]
rtpdec_vp8: Request a keyframe if RTP packets are lost
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Tue, 8 Jan 2013 16:50:26 +0000 (16:50 +0000)]
img2dec: do not change packet pts for image2pipe
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Tue, 11 Dec 2012 13:59:24 +0000 (15:59 +0200)]
rtpdec: Support sending RTCP feedback packets
This sends NACK for missed packets and PLI (picture loss indication)
if a depacketizer indicates that it needs a new keyframe, according
to RFC 4585.
This is only enabled if the SDP indicated that feedback is supported
(via the AVPF or SAVPF profile names).
The feedback packets are throttled to a certain maximum interval
(currently 250 ms) to make sure the feedback packets don't eat up
too much bandwidth (which might be counterproductive). The RFC
specifies a more elaborate feedback packet scheduling.
The feedback packets are currently sent independently from normal
RTCP RR packets, which is not totally spec compliant, but works
fine in the environments I've tested it in. (RFC 5506 allows this,
but requires a SDP attribute for enabling it.)
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Dec 2012 13:52:18 +0000 (15:52 +0200)]
rtpdec: Store the dynamic payload handler in the rtpdec context
This allows calling other dynamic payload handler functions if
needed.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 7 Jan 2013 20:02:07 +0000 (22:02 +0200)]
rtpdec_vp8: Avoid a warning about a possibly unused variable
The warning is a false positive, but I prefer actually initializing
it over masking it with av_uninit, since the code is not performance
critical.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 7 Jan 2013 19:42:46 +0000 (21:42 +0200)]
rtpdec_vp8: Make sure the previous packet is returned
This is a bug from
c7d4de3d73 - if the previous frame wasn't
returned yet (due to missing the final packets), but we have
enough data of it to return the first partition, we write that into
pkt and set returned_old_frame. That commit forgot returning 0 for
the case where this current packet didn't have the end_packet flag
set.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 7 Jan 2013 19:42:40 +0000 (21:42 +0200)]
rtpdec_vp8: Set the timestamp when returning a deferred packet
Signed-off-by: Martin Storsjö <martin@martin.st>
Kanglin [Sat, 5 Jan 2013 08:50:04 +0000 (16:50 +0800)]
hlsenc: Make the start_number option set the right variable
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Tue, 8 Jan 2013 11:43:07 +0000 (11:43 +0000)]
img2dec: seeking support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 8 Jan 2013 13:28:28 +0000 (14:28 +0100)]
ff_find_pix_fmt: return NONE for the "not found" case.
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 8 Jan 2013 11:46:13 +0000 (12:46 +0100)]
lavfi: fix use-after-free in ff_filter_frame.
Unlike the original ff_start_frame code, the incoming reference
may be freed before that point.
Fix CID966654.
Michael Niedermayer [Tue, 8 Jan 2013 12:14:32 +0000 (13:14 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtsp: Respect max_delay for the reordering queue when using custom IO
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 12:05:02 +0000 (13:05 +0100)]
Merge commit '
8729698d50739524665090e083d1bfdf28235724 '
* commit '
8729698d50739524665090e083d1bfdf28235724 ':
rtsp: Recheck the reordering queue if getting a new packet
lavr: log channel conversion description for any-to-any functions
lavr: mix: reduce the mixing matrix when possible
lavr: cosmetics: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 11:56:41 +0000 (12:56 +0100)]
Merge commit '
074a00d192c0e749d677b008b337da42597e780f '
* commit '
074a00d192c0e749d677b008b337da42597e780f ':
lavr: add a public function for setting a custom channel map
lavr: typedef internal structs in internal.h
doc: Extend commit message section
Conflicts:
doc/APIchanges
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 11:48:21 +0000 (12:48 +0100)]
Merge commit '
ac2603be28602bea76cf38bdbf37aead0dc2979a '
* commit '
ac2603be28602bea76cf38bdbf37aead0dc2979a ':
doc: Mention memory allocation in the fuzz testing section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 11:46:53 +0000 (12:46 +0100)]
Merge commit '
dc3e12d1cb65d74fb120197ce869a205718b6715 '
* commit '
dc3e12d1cb65d74fb120197ce869a205718b6715 ':
doc: Mention zzuf in the fuzz testing section
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 11:45:24 +0000 (12:45 +0100)]
Merge commit '
b5f9b9ac3681acb06d95530f34660ba9fe225305 '
* commit '
b5f9b9ac3681acb06d95530f34660ba9fe225305 ':
doc: Merge disjointed bits about emailing patches
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Jan 2013 11:34:14 +0000 (12:34 +0100)]
Merge commit '
9a00374cb4512a58a1fee366b850dfa87c76e1f3 '
* commit '
9a00374cb4512a58a1fee366b850dfa87c76e1f3 ':
doc: Fix a few typos in the developer documentation
xwma: Remove unused variable
asfdec: Fix printf format string length modifier
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 7 Jan 2013 19:26:59 +0000 (21:26 +0200)]
rtsp: Respect max_delay for the reordering queue when using custom IO
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 7 Jan 2013 16:39:04 +0000 (18:39 +0200)]
rtsp: Recheck the reordering queue if getting a new packet
If we timed out and consumed a packet from the reordering queue,
but didn't return a packet to the caller, recheck the queue status.
Otherwise, we could end up in an infinite loop, trying to consume
a queued packet that has already been consumed.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>