]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 21 Jan 2014 20:26:13 +0000 (21:26 +0100)]
Merge commit '
e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d '
* commit '
e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d ':
lavc: do not force the emu edge flag
Conflicts:
libavcodec/utils.c
There should be no such bugs in ffmpeg, but merging it anyway
as its safer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 20:17:11 +0000 (21:17 +0100)]
Merge commit '
025fd76e1a2623c858d8c686a73cc30980a314b0 '
* commit '
025fd76e1a2623c858d8c686a73cc30980a314b0 ':
dxtory: change error code for unexpected slice configuration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 20:01:27 +0000 (21:01 +0100)]
Merge commit '
e91a3f1bdba9b4945e42c191d2e35e9844625fb4 '
* commit '
e91a3f1bdba9b4945e42c191d2e35e9844625fb4 ':
dxtory: correctly handle YUV slices with average odd height
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 19:45:51 +0000 (20:45 +0100)]
Merge commit '
ade4ecb42d2dacd18d04eb8df2afa8131e5ad653 '
* commit '
ade4ecb42d2dacd18d04eb8df2afa8131e5ad653 ':
dxva2: Use correct printf format strings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 19:39:26 +0000 (20:39 +0100)]
Stefano Sabatini [Tue, 21 Jan 2014 19:06:49 +0000 (20:06 +0100)]
lavf/segment: drop pointless variable oc from seg_write_packet()
Stefano Sabatini [Tue, 21 Jan 2014 18:58:41 +0000 (19:58 +0100)]
lavf/segment: remove duplicated and inconsistent cleanup code in seg_write_packet()
In particular, avoid to leave around the seg->avf pointer to freed
structure, and fix crash with:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts
Stefano Sabatini [Tue, 21 Jan 2014 18:56:22 +0000 (19:56 +0100)]
lavf/mpegtsenc: fix weird indent
Stefano Sabatini [Tue, 21 Jan 2014 18:51:28 +0000 (19:51 +0100)]
examples/filtering_audio,video: drop call to avcodec_get_frame_defaults()
The avcodec_get_frame_defaults() function is deprecated and its use
doesn't seem required.
Michael Niedermayer [Tue, 21 Jan 2014 17:31:54 +0000 (18:31 +0100)]
avformat/mov: Ignore the last frame for duration and fps calculation if it looks suspect
The used heuristic will potentially need to be finetuned
Fixes daemon404s fps.mov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 20 Jan 2014 22:23:58 +0000 (23:23 +0100)]
lossless_videodsp.asm: fix compilation.
Fixes these errors with nasm:
libavcodec/x86/lossless_videodsp.asm:86: error: invalid combination of opcode and operands
libavcodec/x86/lossless_videodsp.asm:88: error: invalid combination of opcode and operands
I don't know whether movd or movq was meant, but either way
maskq vs. maskd must match the mov size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Anton Khirnov [Mon, 20 Jan 2014 14:22:09 +0000 (15:22 +0100)]
lavc: do not force the emu edge flag
The default get_buffer2() implementation (and possibly some
user ones) does not allocate edges when this flag is set, which may
expose bugs in some decoders. Until the 10 release is out, it is safer
to remove this part.
Kostya Shishkov [Sat, 18 Jan 2014 13:35:47 +0000 (14:35 +0100)]
dxtory: change error code for unexpected slice configuration
Kostya Shishkov [Sat, 18 Jan 2014 13:34:30 +0000 (14:34 +0100)]
dxtory: correctly handle YUV slices with average odd height
Michael Niedermayer [Tue, 21 Jan 2014 15:01:59 +0000 (16:01 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxva2: Log errors verbosely
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:53:40 +0000 (15:53 +0100)]
Merge commit '
5b2b23f2d69e05c5fcd1c933e383fe60e185574d '
* commit '
5b2b23f2d69e05c5fcd1c933e383fe60e185574d ':
dxva2: Retry IDirectXVideoDecoder_BeginFrame()
This also adds a missig #include to prevent breaking building
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:42:51 +0000 (15:42 +0100)]
Merge commit '
e22ebd04bcab7f86548794556c28ecca46d9c2ac '
* commit '
e22ebd04bcab7f86548794556c28ecca46d9c2ac ':
hevc: Bound check cu_qp_delta
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:38:29 +0000 (15:38 +0100)]
Merge commit '
0d999333f96a34903448579bf13a3209deaee9da '
* commit '
0d999333f96a34903448579bf13a3209deaee9da ':
hevc: Bound check slice_qp
Conflicts:
libavcodec/hevc.c
See:
aead772b5814142b0e530804486ff7970ecd9eef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:30:01 +0000 (15:30 +0100)]
Merge commit '
838740e6420538ad45982da6b1d3aa3ae91307f5 '
* commit '
838740e6420538ad45982da6b1d3aa3ae91307f5 ':
hevc: Prevent some integer overflows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:27:51 +0000 (15:27 +0100)]
Michael Niedermayer [Tue, 21 Jan 2014 14:25:37 +0000 (15:25 +0100)]
Merge commit '
a246d06fe0dc6c2ea65e95327624b4537ff9bd0d '
* commit '
a246d06fe0dc6c2ea65e95327624b4537ff9bd0d ':
hevc: clip pixels when transquant bypass is used
See:
c9fe0caf7a1abde7ca0b1a359f551103064867b1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:18:55 +0000 (15:18 +0100)]
Merge commit '
b37e796082b2d787aff3cd5631bb89c4fd374708 '
* commit '
b37e796082b2d787aff3cd5631bb89c4fd374708 ':
hevc: Use uint64 to check for tile dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:12:53 +0000 (15:12 +0100)]
Merge commit '
d5c15ebeaf1914ea5e3e0599d4316d7c4cf74434 '
* commit '
d5c15ebeaf1914ea5e3e0599d4316d7c4cf74434 ':
hevc: Fix modulo operations
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
See:
4ced5d7780fea2ea49444d6686d26f26b3a2160f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 14:03:10 +0000 (15:03 +0100)]
Merge commit '
a7a07cc98ac548297b5b0628cb81280e11952e3f '
* commit '
a7a07cc98ac548297b5b0628cb81280e11952e3f ':
hevc: check that VPS referenced from SPS exists
Conflicts:
libavcodec/hevc_ps.c
See:
d66bab0a69ac1860e78dd951ad8db1a507e75642
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 21 Jan 2014 13:42:44 +0000 (14:42 +0100)]
dxva2: Use correct printf format strings
Diego Biurrun [Tue, 21 Jan 2014 13:42:23 +0000 (14:42 +0100)]
dxva2: Add missing #includes
Sam Lantinga [Sun, 19 Jan 2014 14:42:36 +0000 (15:42 +0100)]
dxva2: Log errors verbosely
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Sam Lantinga [Thu, 9 Jan 2014 19:59:54 +0000 (19:59 +0000)]
dxva2: Retry IDirectXVideoDecoder_BeginFrame()
If the function returns E_PENDING retry for a fixed number of times.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 11 Jan 2014 19:13:20 +0000 (20:13 +0100)]
hevc: Bound check cu_qp_delta
The T-REC-H.265-
2013044 page 91 states it has to be in the range
[-(26 + s->sps->qp_bd_offset / 2), (25 + s->sps->qp_bd_offset / 2)].
Luca Barbato [Sat, 11 Jan 2014 19:13:20 +0000 (20:13 +0100)]
hevc: Bound check slice_qp
The T-REC-H.265-
2013044 page 79 states it has to be in the range
[-s->sps->qp_bd_offset, 51].
Sample-Id:
00001386 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 11 Jan 2014 11:33:42 +0000 (12:33 +0100)]
hevc: Prevent some integer overflows
get_ue_golomb_long() returns an unsigned.
Sample-Id:
00001541 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Guillaume Martres [Sat, 11 Jan 2014 21:46:25 +0000 (22:46 +0100)]
hevc: Remove useless clip
The src buffer should only contain values in the interval
[0, (1 << BIT_DEPTH) - 1].
Since shift = (BIT_DEPTH - 5), src[x] >> shift must be in
the interval [0, 31], so no clip is needed.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Guillaume Martres [Sat, 11 Jan 2014 21:46:24 +0000 (22:46 +0100)]
hevc: clip pixels when transquant bypass is used
The reconstructed picture should always be clipped (see section 8.6.5),
previously we did not clip coding units where
cu_transquant_bypass_flag == 1.
Sample-Id:
00001325 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 11 Jan 2014 02:20:45 +0000 (03:20 +0100)]
hevc: Use uint64 to check for tile dimensions
And use unsigned datatypes.
Otherwise it would overflow.
Sample-Id:
00001315 -google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Fri, 10 Jan 2014 20:32:05 +0000 (21:32 +0100)]
hevc: Fix modulo operations
Keep qp fields within the range.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Fri, 10 Jan 2014 20:32:04 +0000 (21:32 +0100)]
hevc: check that VPS referenced from SPS exists
This matches how its done for SPS/PPS.
Fixes null pointer dereference.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stefano Sabatini [Sun, 19 Jan 2014 17:32:11 +0000 (18:32 +0100)]
examples/muxing: reduce duration, remove wrong and misleading comment
Set duration to 10 seconds, after it was increased from 5 to 200 seconds
in
8d80f3cb877b890889b1673029387229648901ed .
200 seconds will generate too much data which is annoying especially when
testing.
Michael Niedermayer [Tue, 21 Jan 2014 03:26:30 +0000 (04:26 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: Always reset numref when parsing a new frame header.
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 03:20:47 +0000 (04:20 +0100)]
Merge commit '
89564be444d24f75ea5add8b6987e414cf7aa7d5 '
* commit '
89564be444d24f75ea5add8b6987e414cf7aa7d5 ':
rtmpproto: Send a full, absolute timestamp if it isn't monotonically growing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 03:13:50 +0000 (04:13 +0100)]
Merge commit '
24eb3c791606fe98a1591c13a8b2ba6c342bb3b5 '
* commit '
24eb3c791606fe98a1591c13a8b2ba6c342bb3b5 ':
rtmpproto: Avoid using uninitialized memory
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 02:30:25 +0000 (03:30 +0100)]
Merge commit '
d01e684186bc1631bc176f06b89d33c27ec0d24d '
* commit '
d01e684186bc1631bc176f06b89d33c27ec0d24d ':
mov: do not set avg_frame_rate in the demuxer
Conflicts:
libavformat/mov.c
Not merged
The default fallback code that sets avg_frame_rate guesses the value
from a very small number of frames at the videos start and is wrong in
some cases for the file as a whole.
Now that makes it guess vs guess, but the code in mov is much faster
Also ideally the mov code should be fixed and give a exact avg_frame_rate
based on the actual cts from the index (CTTS/STTS)
If someone has sample(s) which show wrong fps values, please open a ticket
on trac or mail me if its private.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 02:11:15 +0000 (03:11 +0100)]
fate: add a few tests for >8bpc ffvhuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 02:20:11 +0000 (03:20 +0100)]
avcodec/lossless_videodsp: fix diff_int16_c on MIPS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 01:53:43 +0000 (02:53 +0100)]
avcodec/x86/lossless_videodsp: Port lorens add_hfyu_left_prediction_ssse3/sse4 to 16bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 21 Jan 2014 01:33:20 +0000 (02:33 +0100)]
avcodec/x86/lossless_videodsp: use SPLATW in add_int16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 15:28:25 +0000 (15:28 +0000)]
vc1: Always reset numref when parsing a new frame header.
Fixes an issue where the B-frame coding mode switches from interlaced
fields to interlaced frames, causing incorrect decisions in the motion
compensation code and resulting in visual artifacts.
CC: libav-stable@libav.org
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Michael Niedermayer [Mon, 20 Jan 2014 21:21:24 +0000 (22:21 +0100)]
Move sub_hfyu_median_prediction_int16() to losslessviddsp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 21:21:24 +0000 (22:21 +0100)]
Move add_hfyu_median_prediction_int16() to losslessviddsp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 21:21:24 +0000 (22:21 +0100)]
Move add_hfyu_left_prediction_int16 to losslessviddsp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 21:12:56 +0000 (22:12 +0100)]
avcdoec/huffyuvenc: optimize sub_left_prediction()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 19:32:51 +0000 (20:32 +0100)]
Move add/diff_int16 to lossless_videodsp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 17 Jan 2014 12:30:57 +0000 (14:30 +0200)]
rtmpproto: Send a full, absolute timestamp if it isn't monotonically growing
The normal differential timestamps can't handle negative
differences, thus send a full packet header with an absolute
timestamp in these cases.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 17 Jan 2014 12:29:57 +0000 (14:29 +0200)]
rtmpproto: Avoid using uninitialized memory
If the url ends with .flv, we stripped it but didn't initialize
rt->playpath, doing av_strlcat on an uninitialized buffer.
Signed-off-by: Martin Storsjö <martin@martin.st>
Justin Ruggles [Thu, 16 Jan 2014 20:59:05 +0000 (15:59 -0500)]
mov: do not set avg_frame_rate in the demuxer
The track duration is often not reliable or is not the duration
represented by the number of frames. In those cases, avg_frame_rate
was reported incorrectly. Removing this code falls back to the
default calculation in avformat_find_stream_info().
This is a partial revert of commit
c3aeaa540 .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Mon, 20 Jan 2014 18:54:41 +0000 (19:54 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a possible overflow when reading Nikon avi files.
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 17:55:22 +0000 (18:55 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 17:40:37 +0000 (18:40 +0100)]
avcodec/jpeg2000dec: fix error detection in pix_fmt_match()
Fixes out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 17:31:52 +0000 (18:31 +0100)]
avcodec/jpeg2000dec: calculate planar and pixelsize from pixel format descriptor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 17:08:18 +0000 (18:08 +0100)]
avcodec/vmnc: Check that rectangles are within the picture
Prevents out of array accesses with CODEC_FLAG_EMU_EDGE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 16:52:08 +0000 (17:52 +0100)]
avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 16:09:30 +0000 (17:09 +0100)]
Merge commit '
024db24912a39316b0ef0b7d793307d62da038f4 '
* commit '
024db24912a39316b0ef0b7d793307d62da038f4 ':
mpegvideo: allocate edges when encoding.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 15:36:02 +0000 (16:36 +0100)]
avcodec/mpegvideo_enc: disable direct mode in load_input_picture() for dimensions%16 != 0
We currently read a whole 16x16 block from the input at a few places
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 14:07:45 +0000 (15:07 +0100)]
Merge commit '
f7e85ee996b3886c2b13e928b83277382311af96 '
* commit '
f7e85ee996b3886c2b13e928b83277382311af96 ':
lavc: allow the caller to override dimensions in ff_get_buffer()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 19 Jan 2014 17:38:53 +0000 (18:38 +0100)]
examples/muxing: remove redundant {}
Stefano Sabatini [Sun, 19 Jan 2014 16:18:40 +0000 (17:18 +0100)]
examples/muxing: change error checks, from "ret != 0" to "ret < 0"
More consistent and more future-proof.
Stefano Sabatini [Sun, 19 Jan 2014 16:17:14 +0000 (17:17 +0100)]
examples/muxing: factorize write_interleave code
Also log output packet information.
Stefano Sabatini [Sun, 19 Jan 2014 12:45:48 +0000 (13:45 +0100)]
examples: add remuxing example
Show how to perform streamcopy from one container to another.
Anton Khirnov [Thu, 2 Jan 2014 10:07:11 +0000 (11:07 +0100)]
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Anton Khirnov [Wed, 1 Jan 2014 19:04:53 +0000 (20:04 +0100)]
mpegvideo: allocate edges when encoding.
Allocating edges will be removed from generic code, so the encoder must
handle this explicitly.
Anton Khirnov [Wed, 1 Jan 2014 19:03:05 +0000 (20:03 +0100)]
lavc: allow the caller to override dimensions in ff_get_buffer()
This will be useful for allocating edges in the encoders.
Carl Eugen Hoyos [Mon, 20 Jan 2014 10:40:35 +0000 (11:40 +0100)]
Avoid a possible overflow when reading Nikon avi files.
Suggested-by: Reimar
Carl Eugen Hoyos [Mon, 20 Jan 2014 10:25:55 +0000 (11:25 +0100)]
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
Fixes compilation with:
configure --disable-everything --enable-encoder=mpeg2video --disable-asm
Carl Eugen Hoyos [Mon, 20 Jan 2014 10:20:46 +0000 (11:20 +0100)]
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Michael Niedermayer [Mon, 20 Jan 2014 03:23:57 +0000 (04:23 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow decoding of slightly broken Nikon avi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 02:51:21 +0000 (03:51 +0100)]
avcodec/x86/dsp: add_int16_mmx / add_int16_sse2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 20 Jan 2014 02:50:43 +0000 (03:50 +0100)]
avcodec/dsputil/huffyuv: move diff int16 and add int16 to dsputil
This also fixes masking the bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 20 Jan 2014 00:44:07 +0000 (01:44 +0100)]
Allow decoding of slightly broken Nikon avi files.
Fixes ticket #3330.
Peter Ross [Sat, 18 Jan 2014 15:38:45 +0000 (02:38 +1100)]
vp8: remove redundant "equals 1" test
mb_layout is either zero or non-zero.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
wm4 [Sun, 19 Jan 2014 20:50:58 +0000 (21:50 +0100)]
lavf: add avformat_get_mov_video_tags() and avformat_get_mov_audio_tags()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 20:53:13 +0000 (21:53 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
eac3: cosmetics, re-indent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 20:46:27 +0000 (21:46 +0100)]
Merge commit '
ade75fb811500f3e3f284737f123938d83be728f '
* commit '
ade75fb811500f3e3f284737f123938d83be728f ':
(e)ac3: clip surround mix level indexes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 20:36:49 +0000 (21:36 +0100)]
Merge commit '
c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f '
* commit '
c229f571fd3c7d7b567c27c87b2bbcdaee1b0e9f ':
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 20:18:13 +0000 (21:18 +0100)]
Merge commit '
1f604f96ea70503caa642f68a85be6074a5b3f46 '
* commit '
1f604f96ea70503caa642f68a85be6074a5b3f46 ':
ac3: set default matrix encoding modes in parse_frame_header.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 19:13:38 +0000 (20:13 +0100)]
avformat/matroskadec: identify SMI as SVQ3
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Fri, 17 Jan 2014 15:08:18 +0000 (16:08 +0100)]
eac3: cosmetics, re-indent.
Tim Walker [Fri, 17 Jan 2014 15:06:34 +0000 (16:06 +0100)]
(e)ac3: clip surround mix level indexes.
Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
Tim Walker [Fri, 17 Jan 2014 14:57:40 +0000 (15:57 +0100)]
(e)ac3: parse and store the Lt/Rt and LFE mix levels.
Tim Walker [Fri, 17 Jan 2014 14:18:45 +0000 (15:18 +0100)]
ac3: set default matrix encoding modes in parse_frame_header.
Deduplicates some code.
Michael Niedermayer [Sun, 19 Jan 2014 17:35:33 +0000 (18:35 +0100)]
avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 17:35:33 +0000 (18:35 +0100)]
avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0
Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 16:48:02 +0000 (17:48 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/dualinput: fix shortest option.
lavfi/vf_tile: use av_make_q.
lavfi/avf_concat: use av_make_q.
lavfi/af_amerge: use av_make_q.
lavu/rational: add syntactic sugar.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Jan 2014 15:44:58 +0000 (16:44 +0100)]
avcodec/mjpegdec: Dont skip picture allocation if theres no picture allocated
Fixes Ticket 3245
Nicolas George [Fri, 17 Jan 2014 23:34:17 +0000 (00:34 +0100)]
lavfi/dualinput: fix shortest option.
Fix trac ticket #3315.
Nicolas George [Tue, 31 Dec 2013 14:55:45 +0000 (15:55 +0100)]
lavfi/vf_tile: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 14:55:44 +0000 (15:55 +0100)]
lavfi/avf_concat: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 14:55:43 +0000 (15:55 +0100)]
lavfi/af_amerge: use av_make_q.
Nicolas George [Tue, 31 Dec 2013 13:07:25 +0000 (14:07 +0100)]
lavu/rational: add syntactic sugar.
Add a function to create a rational
and macros for common values.
Timothy Gu [Thu, 9 Jan 2014 02:30:20 +0000 (18:30 -0800)]
doc/muxers: add "Options", "Examples", "Syntax", etc. subsections
More consistent with codec docs. Also some minor reorganization of sentences
to fit the new document hierarchy.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Timothy Gu [Thu, 2 Jan 2014 03:56:27 +0000 (19:56 -0800)]
doc/encoders: add libx264rgb doc and supported pixfmts for libx264(rgb)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Stefano Sabatini [Sun, 19 Jan 2014 11:19:11 +0000 (12:19 +0100)]
doc/muxers/segment: fix formula for computing the segment_time_delta value