OSDN Git Service
Clément Bœsch [Thu, 23 Jun 2016 10:16:42 +0000 (12:16 +0200)]
Merge commit '
34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
* commit '
34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
fate: Update fate-lavf-ts after commit
393596f9d5
This commit is a noop, see
c0ff42bf6468c7440568ec15c81edc52289f0c8a
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Thu, 23 Jun 2016 10:14:45 +0000 (12:14 +0200)]
Merge commit '
b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'
* commit '
b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
tools: Port to codec parameters API
Merged-by: Clément Bœsch <clement@stupeflix.com>
David Murmann [Wed, 22 Jun 2016 13:20:33 +0000 (15:20 +0200)]
avformat/mov: add more datatypes in metadata handling
Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Thu, 23 Jun 2016 06:15:43 +0000 (08:15 +0200)]
Merge commit '
393596f9d51134d6e45d81ae129223f4faea1232'
* commit '
393596f9d51134d6e45d81ae129223f4faea1232':
mpegtsenc: stop impersonating ses in sdt
This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in
34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7 on
Libav side.
Merged-by: Clément Bœsch <u@pkh.me>
rogerdpack [Fri, 17 Jun 2016 20:04:34 +0000 (14:04 -0600)]
dshow: avoid duplicate NULL check before free
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
rogerdpack [Wed, 15 Jun 2016 08:17:11 +0000 (02:17 -0600)]
dshow: don't add two instances of same device to graphs
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jun 2016 22:49:29 +0000 (00:49 +0200)]
MAINTAINERS: Remove Linux / PowerPC maintainer
See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Petru Rares Sincraian [Wed, 22 Jun 2016 13:24:26 +0000 (15:24 +0200)]
fate: add apad test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 22 Jun 2016 22:42:16 +0000 (00:42 +0200)]
lavc: fix previous merge
Clément Bœsch [Wed, 22 Jun 2016 22:29:25 +0000 (00:29 +0200)]
Merge commit '
ffa190d0479d2370dd89c95692f822cbff2cc24c'
* commit '
ffa190d0479d2370dd89c95692f822cbff2cc24c':
Move VLC and RL_VLC_ELEM structure definitions to a separate header
Merged-by: Clément Bœsch <u@pkh.me>
Hendrik Leppkes [Wed, 22 Jun 2016 21:36:37 +0000 (23:36 +0200)]
Merge commit '
b23613268c6b56a8f9de7859562d82b4b88353d9'
* commit '
b23613268c6b56a8f9de7859562d82b4b88353d9':
avconv_dxva2: use the hwcontext API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Wed, 22 Jun 2016 21:27:30 +0000 (23:27 +0200)]
hwcontext_dxva2: support P010 10-bit surfaces
Petru Rares Sincraian [Tue, 21 Jun 2016 12:43:01 +0000 (14:43 +0200)]
fate: add test for amerge
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Wed, 22 Jun 2016 20:38:49 +0000 (22:38 +0200)]
Merge commit '
c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
* commit '
c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Wed, 22 Jun 2016 18:33:09 +0000 (20:33 +0200)]
avformat/flacdec: Fix seeking close to EOF
Fixes Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jun 2016 18:19:40 +0000 (20:19 +0200)]
avcodec/flac_parser: Raise threshold for detecting invalid data
Fixes regression from Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 22 Jun 2016 18:07:46 +0000 (20:07 +0200)]
lavc/get_bits: add a logging context to check_marker()
Based on
d338abb664febbc2c7266af7818aab1f12dbc161
Clément Bœsch [Wed, 22 Jun 2016 18:05:03 +0000 (20:05 +0200)]
Merge commit '
d338abb664febbc2c7266af7818aab1f12dbc161'
* commit '
d338abb664febbc2c7266af7818aab1f12dbc161':
mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL
This commit is a noop.
Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:57:11 +0000 (19:57 +0200)]
Merge commit '
e4b38878da6b38ef5ca54ce14be985d6ae088834'
* commit '
e4b38878da6b38ef5ca54ce14be985d6ae088834':
Move check_marker() from get_bits to mpeg4videodec
Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:51:36 +0000 (19:51 +0200)]
Merge commit '
31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
* commit '
31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
lavc: mark the old audio/video encoding API as deprecated
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:40:49 +0000 (19:40 +0200)]
Merge commit '
2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'
* commit '
2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
x86inc: Enable AVX emulation in additional cases
This commit is a noop, see
e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:40:29 +0000 (19:40 +0200)]
Merge commit '
300fb0df84e9a563ed3b8a9b3d365abb6cf34600'
* commit '
300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
x86inc: Improve handling of %ifid with multi-token parameters
This commit is a noop, see
4bd5583acea5d65a2f8fd8fcd5ab7b404af23f45
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:39:13 +0000 (19:39 +0200)]
Merge commit '
8d02579fae756336ae2a88d521e8cf2f6b436a2f'
* commit '
8d02579fae756336ae2a88d521e8cf2f6b436a2f':
x86inc: Fix AVX emulation of some instructions
This commit is a noop, see
42be240ad6874fbc2b0e88a3ee133ece58d60692
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:38:53 +0000 (19:38 +0200)]
Merge commit '
ba3eb745cc236765c916b74b39c1874da5c3aefc'
* commit '
ba3eb745cc236765c916b74b39c1874da5c3aefc':
x86inc: Fix AVX emulation of scalar float instructions
This commit is a noop, see
8dd3ee9dddcaf1d538252d77dd2af3ea139f4f96
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:32:00 +0000 (19:32 +0200)]
Merge commit '
8996515b137f962e3a8691241c285c96437b6c53'
* commit '
8996515b137f962e3a8691241c285c96437b6c53':
avpacket: fix setting AVPacket.data in av_packet_ref()
This commit is a noop, see
ed3a02547c71ac06fa27f17ad53116a74f78d927
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)]
Merge commit '
e62ff72fc1052273deb708ba715f73e5187281d4'
* commit '
e62ff72fc1052273deb708ba715f73e5187281d4':
lavc: make avcodec_open2() fail when the timebase is not set for encoding
Merged-by: Clément Bœsch <u@pkh.me>
Michael Niedermayer [Wed, 22 Jun 2016 16:39:39 +0000 (18:39 +0200)]
avcodec/tests/options: Set timebase
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 22 Jun 2016 15:36:42 +0000 (17:36 +0200)]
Merge commit '
11de006babf735aafa3462d43dd2c02bb6ac6e2f'
* commit '
11de006babf735aafa3462d43dd2c02bb6ac6e2f':
Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Wed, 8 Jun 2016 13:16:34 +0000 (15:16 +0200)]
lavf/img2dec: add pnm pipe demuxers
Michael Niedermayer [Wed, 22 Jun 2016 11:59:19 +0000 (13:59 +0200)]
avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed
The internal avctx bitrate is copied into codecpar after estimate_timings()
Fixes Ticket5646
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jun 2016 11:58:42 +0000 (13:58 +0200)]
avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 22 Jun 2016 12:00:08 +0000 (14:00 +0200)]
swr: fix time.h include
Clément Bœsch [Wed, 22 Jun 2016 11:44:29 +0000 (13:44 +0200)]
Merge commit '
a6a750c7ef240b72ce01e9653343a0ddf247d196'
* commit '
a6a750c7ef240b72ce01e9653343a0ddf247d196':
tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com>
Michael Bradshaw [Mon, 20 Jun 2016 21:25:48 +0000 (14:25 -0700)]
libavformat/matroskaenc: omit segment UID for webm
SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID
Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 22 Jun 2016 09:25:49 +0000 (11:25 +0200)]
Merge commit '
257f00ec1ab06a2a161f535036c6512f3fc8e801'
* commit '
257f00ec1ab06a2a161f535036c6512f3fc8e801':
Split global .gitignore file into per-directory files
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Wed, 22 Jun 2016 09:09:19 +0000 (11:09 +0200)]
lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard
Clément Bœsch [Wed, 22 Jun 2016 09:07:54 +0000 (11:07 +0200)]
lavc/error_resilience: remove unused skip_last_mv label
Unused since
a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886
Clément Bœsch [Wed, 22 Jun 2016 09:06:04 +0000 (11:06 +0200)]
Merge commit '
763d69bfb2f0094e99f43e657cfd2b0471361f6b'
* commit '
763d69bfb2f0094e99f43e657cfd2b0471361f6b':
Add some more deprecation guards
- psnr() deprecation is not merged within ffmpeg.c as we still use it in
non-deprecated code
- the XVMC chunk is not merged as we still apparently maintain it
- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Matthieu Bouron [Tue, 21 Jun 2016 14:09:06 +0000 (16:09 +0200)]
lavc/videotoolbox: fix avcC extradata creation
Fixes properly ticket #5638.
Since
772ad7142dff590c7bb30370acf5d3c9a8fb512b PPS and SPS contain the
nal type byte.
This reverts commit
b8d754c5d0a2e99022c27bd1159ea3f597f67452.
This reverts commit
8e47a99f576da10b2a36e33b6b9acbf1c2da7485.
Michael Niedermayer [Tue, 21 Jun 2016 21:40:05 +0000 (23:40 +0200)]
avformat/flvdec: Do not check last size if it could not be read due to EOF
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 21 Jun 2016 21:39:24 +0000 (23:39 +0200)]
avformat/flvdec: Also print sum_flv_tag_size on size mismatches
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 21 Jun 2016 21:38:23 +0000 (23:38 +0200)]
avformat/flvdec: Accept last size if its off by 1
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Tue, 21 Jun 2016 20:40:56 +0000 (22:40 +0200)]
Merge commit '
b7e64fba7f37cc0399beae844f0a5dbef9219376'
* commit '
b7e64fba7f37cc0399beae844f0a5dbef9219376':
Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:26:44 +0000 (22:26 +0200)]
Merge commit '
bc2a32969eb4db17677971def5ad5b936d9d1648'
* commit '
bc2a32969eb4db17677971def5ad5b936d9d1648':
rtsp: Parse SSRC attributes in the SDP
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:24:30 +0000 (22:24 +0200)]
Merge commit '
9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'
* commit '
9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
rtpdec: Always check if we have the next packet queued
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:22:51 +0000 (22:22 +0200)]
Merge commit '
0c1d66a07917602303f129f5a5651faeec2415d5'
* commit '
0c1d66a07917602303f129f5a5651faeec2415d5':
avconv_vaapi: fix double-free with some unsupported streams
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:20:49 +0000 (22:20 +0200)]
Clément Bœsch [Tue, 21 Jun 2016 20:16:16 +0000 (22:16 +0200)]
Clément Bœsch [Tue, 21 Jun 2016 20:12:36 +0000 (22:12 +0200)]
Merge commit '
283226e11ccf50a71d25d150fbbf1743f74c6c49'
* commit '
283226e11ccf50a71d25d150fbbf1743f74c6c49':
simple_idct_template: Fix strict aliasing violation
See
5df703aa1b03814e9cd216ab703501481166b3bb
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:10:54 +0000 (22:10 +0200)]
Merge commit '
e9443105ea4e8bc1d826ddceeba2816488c6ce92'
* commit '
e9443105ea4e8bc1d826ddceeba2816488c6ce92':
avio: Remove a leftover comment
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:09:35 +0000 (22:09 +0200)]
Merge commit '
5afb94c817abffad030c6b94d7003dca8aace3d5'
* commit '
5afb94c817abffad030c6b94d7003dca8aace3d5':
Mark read-only tables as static
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 20:03:18 +0000 (22:03 +0200)]
Merge commit '
1f1ad8ace040a08edc2646ff638ca42a8828779f'
* commit '
1f1ad8ace040a08edc2646ff638ca42a8828779f':
configure: Document --enable-libfontconfig
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 19:59:21 +0000 (21:59 +0200)]
Merge commit '
def03d14687b9d089950ba8e45083e666de4eb68'
* commit '
def03d14687b9d089950ba8e45083e666de4eb68':
vf_frei0r: Drop overly verbose and broken debug output
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Tue, 21 Jun 2016 19:55:20 +0000 (21:55 +0200)]
Merge commit '
41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '
41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Aman Gupta [Tue, 14 Jun 2016 18:08:55 +0000 (11:08 -0700)]
avformat/mpegts: include stream type for aac
this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Tue, 21 Jun 2016 13:42:49 +0000 (15:42 +0200)]
Merge commit '
5c31eaa9998b2185e0aa04d11adff128498dc14a'
* commit '
5c31eaa9998b2185e0aa04d11adff128498dc14a':
Remove unnecessary get_bits.h #includes and add missing headers where needed.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 13:38:52 +0000 (15:38 +0200)]
Merge commit '
c11c693accaad65d3f4afa44c27f2338a2e3bf8f'
* commit '
c11c693accaad65d3f4afa44c27f2338a2e3bf8f':
h264: Drop broken trace debug output
This commit is not merged as the debug was fixed in
94011f994ab2e531a49fabbb2c86e735f87df3ca.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 13:36:43 +0000 (15:36 +0200)]
Merge commit '
5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
* commit '
5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
vaapi: Drop pointless debug output
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 13:30:16 +0000 (15:30 +0200)]
Merge commit '
015c2d923902fcd562571993eaf1231ce388c7f0'
* commit '
015c2d923902fcd562571993eaf1231ce388c7f0':
libopencore-amr: Fix ff_dlog()/av_log() invocations
The log changed in our tree in
4a289624545c559107fac93597b23289a8b15c9f
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 13:24:59 +0000 (15:24 +0200)]
Merge commit '
0f40c9098498ad90dbbd2380eb4269015e84bde4'
* commit '
0f40c9098498ad90dbbd2380eb4269015e84bde4':
Drop pointless assert.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 12:37:55 +0000 (14:37 +0200)]
Merge commit '
74d98d1b0e0e7af444c933ea3c472494de3ce6f2'
* commit '
74d98d1b0e0e7af444c933ea3c472494de3ce6f2':
mpegts: Validate the SL Packet Header Configuration
See
e630ca5111077fa8adc972fe8a3d7e2b3e8dc91f
Our local timestamp_len > 64 is adjusted to > 63 to match the Libav
check and the actual specifications (14496-1, 10.2.2).
There is no need to request a sample as it violates the specifications
and such a file would likely be the result of a crafted/fuzzed sample.
On the other hand, the clipping of the value is kept for extra safety.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Matthieu Bouron [Fri, 10 Jun 2016 11:16:09 +0000 (13:16 +0200)]
lavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPS
Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS
to be set in their respective csd-{0,1} buffers.
Clément Bœsch [Tue, 21 Jun 2016 11:45:40 +0000 (13:45 +0200)]
Merge commit '
1982d0cc561912d685a0c2dbe58bc19f50bae231'
* commit '
1982d0cc561912d685a0c2dbe58bc19f50bae231':
fate: Add test for MTS2/MSS4
The timestamps differ because we use a more appropriate timebase.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:44:35 +0000 (13:44 +0200)]
Merge commit '
375cad096565b0796df2a307faae7619766f7c49'
* commit '
375cad096565b0796df2a307faae7619766f7c49':
rtpdec_vp9: Support parsing the scalability structure
This commit is a noop, see
cab237953ea60963c627df53833513a0764ff8fe
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:43:32 +0000 (13:43 +0200)]
Merge commit '
943f4bea37dc8d510d2f43c0bbe0df59c9b34768'
* commit '
943f4bea37dc8d510d2f43c0bbe0df59c9b34768':
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
This commit is a noop, see
d50b3fe463138a8378d0d0884750bd71db825c82
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:41:35 +0000 (13:41 +0200)]
Merge commit '
b55e3633d3f60cf0f51269f25936409b79d2729e'
* commit '
b55e3633d3f60cf0f51269f25936409b79d2729e':
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for unimplemented features
This commit is a noop, see
94dee9067acd6439550ccc4bdfef1694814ea0bc
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:38:54 +0000 (13:38 +0200)]
Merge commit '
70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'
* commit '
70c77fdfc1076fd7f6cd20079237ddc97e1a10bc':
rtpdec_vp9: Update header parsing to spec draft 02
This commit is a noop, see
43880f971662c6f79f58ffb373200306e155e0f5
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:37:50 +0000 (13:37 +0200)]
Merge commit '
33b83d89e3720aecc60b4df3d8021cbc5780dd91'
* commit '
33b83d89e3720aecc60b4df3d8021cbc5780dd91':
rtpdec_vp9: Make sure to free the temp buffer on close
This commit is a noop, see
03aa4cd22b4b1522260355c499729c08ce640732
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:36:32 +0000 (13:36 +0200)]
Merge commit '
c26741332165a049717e6da84db13a24ee8edade'
* commit '
c26741332165a049717e6da84db13a24ee8edade':
Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries
This commit is not merged as the previous one wasn't either.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:36:07 +0000 (13:36 +0200)]
Merge commit '
33ac77e850efdfd0e8835950c3d947baffd4df45'
* commit '
33ac77e850efdfd0e8835950c3d947baffd4df45':
mmaldec: autodetect by default
This commit is not merged (it will be reverted in the next one to
merge).
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:35:31 +0000 (13:35 +0200)]
lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges
Clément Bœsch [Tue, 21 Jun 2016 11:31:15 +0000 (13:31 +0200)]
Merge commit '
74beead9bd596180bcac6108548fc0a86d8eb4ae'
* commit '
74beead9bd596180bcac6108548fc0a86d8eb4ae':
mmaldec: limit internal buffering
See
14a90c9ef09a4b046500dceab5ca1875e330a376
The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is
merged.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:25:09 +0000 (13:25 +0200)]
Merge commit '
45a954f5aa35161a741fffd6c8bb92e9f91a1720'
* commit '
45a954f5aa35161a741fffd6c8bb92e9f91a1720':
mmaldec: print the MMAL format FourCC automatically
This commit is a noop, see
d27a12cb0982921e503e68692bb99b6dfe1a6144
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:23:55 +0000 (13:23 +0200)]
Merge commit '
84bba36846870c6269732351c022eeef094c6c83'
* commit '
84bba36846870c6269732351c022eeef094c6c83':
configure: fix mmal build dependencies
This commit is a noop, see
0badf4564a90ffa6f104b275277a6015a1d33905
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:22:22 +0000 (13:22 +0200)]
Merge commit '
ce589940c2cac936891e8bba275580d6efc41e8b'
* commit '
ce589940c2cac936891e8bba275580d6efc41e8b':
mmaldec: send only a single EOS packet on flushing
This commit is a noop, see
dafe4cd29cada351a2785433b24401fc602911c4
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:21:50 +0000 (13:21 +0200)]
Merge commit '
46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'
* commit '
46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
mmaldec: correct package buffering accounting
This commit is a noop, see
a55fbfa4c4967068a9c37f041110ace9fb633d4e
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:21:06 +0000 (13:21 +0200)]
Merge commit '
9a382f363950c0aab1500aa0937f73bf4dde9ee3'
* commit '
9a382f363950c0aab1500aa0937f73bf4dde9ee3':
mmaldec: add vc1 decoding support
This commit is a noop, see
b07cbf6724207ba768ebb2ccdee1b6749fd6ca31
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:18:47 +0000 (13:18 +0200)]
Merge commit '
d52208e8d549d4c84a2a348aa3790b1a177e779a'
* commit '
d52208e8d549d4c84a2a348aa3790b1a177e779a':
mmaldec: Add mpeg2 decoding support
This commit is a noop, see
7ebe12fc55591053cbd194ca6638e5c32beaee45
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:06:11 +0000 (13:06 +0200)]
Merge commit '
2689bb115ca64921789092148deaf213a0d94d2e'
* commit '
2689bb115ca64921789092148deaf213a0d94d2e':
mmaldec: Fix avpriv_atomic_get usage
This commit is a noop, see
da43e9e157a3c64337348b44193ab390bd481911
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 11:04:40 +0000 (13:04 +0200)]
Merge commit '
366ba2dee1f2b17825b42e2164d3b9879f0271b1'
* commit '
366ba2dee1f2b17825b42e2164d3b9879f0271b1':
mmaldec: Use av_assert0() instead of assert()
This commit is a noop, see
c0152ebb9e0501b9d3d4386531995683a4ac824c
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 10:58:56 +0000 (12:58 +0200)]
Merge commit '
f2422b58756ba97e3cbadc190f1ed950aa201ec7'
* commit '
f2422b58756ba97e3cbadc190f1ed950aa201ec7':
testprogs: Mark some tables as static const
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 10:45:58 +0000 (12:45 +0200)]
Merge commit '
5b1409c75563b4a3aca113c34d09e3b5442de47f'
* commit '
5b1409c75563b4a3aca113c34d09e3b5442de47f':
fate: Add test for MSS1
Test was already present, see
849e55e58ecc6815e8bd326ac18dda748db48682.
The merge removes the audio decoding present in our version and
simplifies the rules.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 10:20:38 +0000 (12:20 +0200)]
Merge commit '
4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
* commit '
4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
dds: Add support for monochrome images
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 10:17:12 +0000 (12:17 +0200)]
Merge commit '
6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'
* commit '
6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3':
dds: Drop gray-alpha swapping
This commit is not merged, see
139cbeb75e0f5e3176b2b09660d2570b1bcc2408.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 09:33:56 +0000 (11:33 +0200)]
Merge commit '
39cdbb12aa2140520246bc4c3e22436b9f8a121a'
* commit '
39cdbb12aa2140520246bc4c3e22436b9f8a121a':
dxva2_h264: Unbreak compilation after
3176217c6
This commit is a noop. The compilation was fixed in the merge commit
itself (
1534ef87c74cc66a117bf61c467641c2129bc964). The additional local
unused sps is not merged.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 09:30:29 +0000 (11:30 +0200)]
Merge commit '
4012fe1ee819edc7689e182189e66c5401fb4b41'
* commit '
4012fe1ee819edc7689e182189e66c5401fb4b41':
ape: Unbreak adaptcoeffs computation
This commit is a noop, see
dd4fb2339f76a958bd7e63e5ac18b8c10852ae1a
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 09:25:53 +0000 (11:25 +0200)]
Merge commit '
2e5bde956519ae19cedfa482e199518e495bcaf5'
* commit '
2e5bde956519ae19cedfa482e199518e495bcaf5':
h264: eliminate max_contexts
This commit is a noop as max_contexts can change and mismatch the
nb_slice_ctx (see
507b01f89969601f15555f7416804fb691632cbb).
The file in the Ticket is not decodable anymore, so it was not possible
to check if that code path was triggerable some way or another, or even
test a different fix.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 08:28:14 +0000 (10:28 +0200)]
Merge commit '
e3c9041cfe2e6526802255583d27abf9a921863e'
* commit '
e3c9041cfe2e6526802255583d27abf9a921863e':
h264: allocate some tables per slice contexts, not threads
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 08:19:13 +0000 (10:19 +0200)]
Merge commit '
e0652795292223f8bc8e5bac019c1fca7323d23c'
* commit '
e0652795292223f8bc8e5bac019c1fca7323d23c':
h264: remove an artificial restriction on the number of slice threads
Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Tue, 21 Jun 2016 08:09:19 +0000 (10:09 +0200)]
lavc/h264_slice: mark ref2frm as const pointers
James Almer [Thu, 16 Jun 2016 22:17:26 +0000 (19:17 -0300)]
avformat/oggparsevorbis: free base64 encoded data immediately after decoding it
It has no use afterwards and freeing it before calling ff_flac_parse_picture()
may help prevent OOM issues on memory constrained scenarios.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 16 Jun 2016 22:10:42 +0000 (19:10 -0300)]
avformat/oggparsevorbis: use the base64 decode size macro
Allocate the memory needed for the decoded data rather than the
encoded data.
Signed-off-by: James Almer <jamrial@gmail.com>
Muhammad Faiz [Wed, 15 Jun 2016 17:17:35 +0000 (00:17 +0700)]
swresample/x86: add support for exact_rational
phase_shift and phase_mask is removed
generally exact_rational=on is faster than exact_rational=off
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Clément Bœsch [Mon, 20 Jun 2016 19:32:23 +0000 (21:32 +0200)]
MAINTAINERS: update my entries
Benjamin Larsson [Mon, 20 Jun 2016 19:19:45 +0000 (11:19 -0800)]
Remove Benjamin Larsson from MAINTAINERS
Signed-off-by: Lou Logan <lou@lrcd.com>
Petru Rares Sincraian [Mon, 20 Jun 2016 17:32:36 +0000 (19:32 +0200)]
fate: add test for alimiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Matthieu Bouron [Mon, 20 Jun 2016 14:02:10 +0000 (16:02 +0200)]
lavc/h264_ps: add ff_h264_ps_uninit and use it
Matthieu Bouron [Thu, 16 Jun 2016 11:16:52 +0000 (13:16 +0200)]
lavf/mov: ignore ctts entries that do not apply to a least one sample
Fixes packet pts of samples which contain ctts entries with count <= 0.
Clément Bœsch [Mon, 20 Jun 2016 13:38:11 +0000 (15:38 +0200)]
Merge commit '
4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'
* commit '
4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69':
h264: remove pointless setting of some variables in loop_filter
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Mon, 20 Jun 2016 13:36:44 +0000 (15:36 +0200)]
Merge commit '
9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'
* commit '
9c858ce33fa9b94ebc320dd9d9fa423e708e90cc':
h264: remove a pointless comment
Merged-by: Clément Bœsch <clement@stupeflix.com>