ffmpeg.git
2 years agopthread_frame: make accesses to debug field be protected by owner lock. n3.3
Ronald S. Bultje [Thu, 6 Apr 2017 17:58:59 +0000 (13:58 -0400)]
pthread_frame: make accesses to debug field be protected by owner lock.

The av_log() is done outside the lock, but this way the accesses to the
field (reads and writes) are always protected by a mutex. The av_log()
is not run inside the lock context because it may involve user callbacks
and doing that in performance-sensitive code is probably not a good idea.

This should fix occasional tsan warnings when running fate-h264, like:

WARNING: ThreadSanitizer: data race (pid=10916)
  Write of size 4 at 0x7d64000174fc by main thread (mutexes: write M2313):
    #0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000df7b06)
[..]
  Previous read of size 4 at 0x7d64000174fc by thread T1 (mutexes: write M2311):
    #0 ff_thread_await_progress src/libavcodec/pthread_frame.c:592 (ffmpeg+0x000000df8b3e)

(cherry picked from commit 2e664b9c1e73c80aab91070c1eb7676f04bdd12d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agopthread_frame: allow per-field ThreadFrame owners.
Ronald S. Bultje [Mon, 3 Apr 2017 14:24:05 +0000 (10:24 -0400)]
pthread_frame: allow per-field ThreadFrame owners.

This tries to handle cases where separate invocations of decode_frame()
(each running in separate threads) write to respective fields in the
same AVFrame->data[]. Having per-field owners makes interaction between
readers (the referencing thread) and writers (the decoding thread)
slightly more optimal if both accesses are field-based, since they will
use the respective producer's thread objects (mutex/cond) instead of
sharing the thread objects of the first field's producer.

In practice, this fixes the following tsan-warning in fate-h264:

WARNING: ThreadSanitizer: data race (pid=21615)
  Read of size 4 at 0x7d640000d9fc by thread T2 (mutexes: write M1006):
    #0 ff_thread_report_progress pthread_frame.c:569 (ffmpeg:x86_64+0x100f7cf54)
[..]
  Previous write of size 4 at 0x7d640000d9fc by main thread (mutexes: write M1004):
    #0 update_context_from_user pthread_frame.c:335 (ffmpeg:x86_64+0x100f81abb)

(cherry picked from commit 083300bea935d125b83f60d7030f78a7ffb0f3df)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agovp8: make mv_min/max thread-local if using partition threading.
Ronald S. Bultje [Wed, 5 Apr 2017 20:19:55 +0000 (16:19 -0400)]
vp8: make mv_min/max thread-local if using partition threading.

Fixes tsan warnings like this in fate-vp8-test-vector-007:

WARNING: ThreadSanitizer: data race (pid=65909)
  Write of size 4 at 0x7d8c0000e088 by thread T1:
    #0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede)
[..]
  Previous write of size 4 at 0x7d8c0000e088 by thread T2:
    #0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede)

(cherry picked from commit fed92adbb3fc6cbf735e3df9a2f7d0a2917fcfbd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agovp8: make wait/thread_mb_pos atomic.
Ronald S. Bultje [Wed, 5 Apr 2017 20:18:54 +0000 (16:18 -0400)]
vp8: make wait/thread_mb_pos atomic.

Fixes tsan warnings like this in fate-vp8-test-vector-007:

WARNING: ThreadSanitizer: data race (pid=3590)
  Write of size 4 at 0x7d8c0000e07c by thread T2:
    #0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e)
[..]
  Previous write of size 4 at 0x7d8c0000e07c by thread T1:
    #0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e)

(cherry picked from commit 9a54c6f243412f62bae498ddcac337cb18ae6290)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agohuffyuv: assign correct per-thread avctx pointer to HYuvContext::avctx.
Ronald S. Bultje [Tue, 4 Apr 2017 02:28:22 +0000 (22:28 -0400)]
huffyuv: assign correct per-thread avctx pointer to HYuvContext::avctx.

Fixes the following tsan warning when running fate-vsynth_lena-ffvhuff:

WARNING: ThreadSanitizer: data race (pid=6484)
  Write of size 8 at 0x7d64000154b8 by main thread (mutexes: write M1331):
    #0 update_context_from_user src/libavcodec/pthread_frame.c:331 (ffmpeg+0x000000dca887)
[..]
  Previous read of size 8 at 0x7d64000154b8 by thread T2 (mutexes: write M1334):
    #0 draw_slice src/libavcodec/huffyuvdec.c:857 (ffmpeg+0x000000bcc86f)

(cherry picked from commit 7c7e7c44a6eb68eca861e45cb2ce78f582b12c69)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agopng: set AVFrame flags/fields before calling setup_finished().
Ronald S. Bultje [Mon, 3 Apr 2017 18:43:40 +0000 (14:43 -0400)]
png: set AVFrame flags/fields before calling setup_finished().

Fixes tsan warnings in fate-apng:

WARNING: ThreadSanitizer: data race (pid=51230)
  Read of size 4 at 0x7d50000042fc by main thread (mutexes: write M1000):
    #0 frame_copy_props frame.c:302 (ffmpeg:x86_64+0x1019a35d6)
[..]
  Previous write of size 4 at 0x7d50000042fc by thread T1 (mutexes: write M997):
    #0 decode_idat_chunk pngdec.c:708 (ffmpeg:x86_64+0x100f5562a)

(cherry picked from commit eff2861a757b8a46398e6fcb844b960b4775daad)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agopng: split header state and data state in two separate variables.
Ronald S. Bultje [Mon, 3 Apr 2017 14:08:29 +0000 (10:08 -0400)]
png: split header state and data state in two separate variables.

Fixes a reported (but false) race condition in tsan for fate-apng:

WARNING: ThreadSanitizer: data race (pid=6274)
  Read of size 4 at 0x7d680001ec78 by main thread (mutexes: write M1338):
    #0 update_thread_context src/libavcodec/pngdec.c:1456 (ffmpeg+0x000000dacf0c)
[..]
  Previous write of size 4 at 0x7d680001ec78 by thread T1 (mutexes: write M1335):
    #0 decode_idat_chunk src/libavcodec/pngdec.c:737 (ffmpeg+0x000000dae951)

(cherry picked from commit 478f1c3d5e5463a284ea7efecfc62d47ba3be11a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agohevc: only write to max_ra and pocTid0 in the first slice.
Ronald S. Bultje [Mon, 3 Apr 2017 13:51:10 +0000 (09:51 -0400)]
hevc: only write to max_ra and pocTid0 in the first slice.

Values from subsequent values are guaranteed to be identical (since
poc and nal_unit_type are checked to be the same between slices), so
this doesn't affect output in any way, but does resolve the remaining
reported race conditions (by tsan) in fate-hevc.

In practice, this fixes tsan warnings like this:

WARNING: ThreadSanitizer: data race (pid=25334)
  Read of size 4 at 0x7d9c0001adcc by main thread (mutexes: write M1386):
    #0 hevc_update_thread_context src/libavcodec/hevcdec.c:3310 (ffmpeg+0x000000b41c7c)
[..]
  Previous write of size 4 at 0x7d9c0001adcc by thread T1 (mutexes: write M1383):
    #0 hls_slice_header src/libavcodec/hevcdec.c:596 (ffmpeg+0x000000b43a22)

(cherry picked from commit 1f50baa2b2da7fdbfccf0662883f38a763ff6619)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agopthread_frame: call update_context_from_user() after acquiring lock.
Ronald S. Bultje [Mon, 3 Apr 2017 13:48:53 +0000 (09:48 -0400)]
pthread_frame: call update_context_from_user() after acquiring lock.

Otherwise the thread may still be in the middle of decoding a previous
frame, which would effectively trigger a race condition on any field
concurrently read and written.

In practice, this fixes tsan warnings like the following:

WARNING: ThreadSanitizer: data race (pid=17380)
  Write of size 4 at 0x7d64000160fc by main thread:
    #0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000dca515)
[..]
  Previous read of size 4 at 0x7d64000160fc by thread T2 (mutexes: write M1821):
    #0 ff_thread_report_progress src/libavcodec/pthread_frame.c:565 (ffmpeg+0x000000dcb08a)

(cherry picked from commit 1269cd5b6f540bef5913bf134d2f461aac50d70b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg: make transcode_init_done atomic.
Ronald S. Bultje [Fri, 31 Mar 2017 15:27:20 +0000 (11:27 -0400)]
ffmpeg: make transcode_init_done atomic.

Should fix tsan warnings in fate-fifo-muxer-h264/wav:

WARNING: ThreadSanitizer: data race (pid=26552)
  Write of size 4 at 0x000001e0d7c0 by main thread:
    #0 transcode_init src/ffmpeg.c:3761 (ffmpeg+0x00000050ca1c)
[..]
  Previous read of size 4 at 0x000001e0d7c0 by thread T1:
    #0 decode_interrupt_cb src/ffmpeg.c:460 (ffmpeg+0x0000004fde19)

(cherry picked from commit 76d8c77430e9e0110623705bfb54d922cc2ac3ea)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoh264: don't sync pic_id between threads.
Ronald S. Bultje [Mon, 3 Apr 2017 13:25:15 +0000 (09:25 -0400)]
h264: don't sync pic_id between threads.

This is how the ref list manager links bitstream IDs to H264Picture/Ref
objects, and is local to the producer thread. There is no need for the
consumer thread to know the bitstream IDs of its references in their
respective producer threads.

In practice, this fixes tsan warnings when running fate-h264:

WARNING: ThreadSanitizer: data race (pid=19295)
  Read of size 4 at 0x7dbc0000e614 by main thread (mutexes: write M1914):
    #0 ff_h264_ref_picture src/libavcodec/h264_picture.c:112 (ffmpeg+0x0000013b3709)
[..]
  Previous write of size 4 at 0x7dbc0000e614 by thread T2 (mutexes: write M1917):
    #0 build_def_list src/libavcodec/h264_refs.c:91 (ffmpeg+0x0000013b46cf)

(cherry picked from commit e72690b18da064f6c0f04f09ccde72b6636e3159)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoh264: don't re-call ff_h264_direct_ref_list_init() w/ frame-mt.
Ronald S. Bultje [Thu, 6 Apr 2017 15:47:03 +0000 (11:47 -0400)]
h264: don't re-call ff_h264_direct_ref_list_init() w/ frame-mt.

I'm hoping that this will address the remaining tsan fate-h264 issues:

WARNING: ThreadSanitizer: data race (pid=24478)
  Read of size 8 at 0x7dbc0001c828 by main thread (mutexes: write M3243):
    #0 ff_h264_ref_picture src/libavcodec/h264_picture.c:107 (ffmpeg+0x0000013b78d8)
[..]
  Previous write of size 1 at 0x7dbc0001c82e by thread T2 (mutexes: write M3245):
    #0 ff_h264_direct_ref_list_init src/libavcodec/h264_direct.c:137 (ffmpeg+0x000001382c93)

But I'm not sure because I haven't been able to reproduce locally.

(cherry picked from commit 7f05c5cea04112471d8147487aa3b44141922d09)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/movenc: auto insert vp9_superframe bsf when needed
James Almer [Mon, 10 Apr 2017 04:32:18 +0000 (01:32 -0300)]
avformat/movenc: auto insert vp9_superframe bsf when needed

Experimental VP9 support was added to the muxer recently.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit d36a3f5a78bb1e15bbaffc7b92dbeb6a50c28ca9)

2 years agoconfigure: Fix decklink license dependency.
Carl Eugen Hoyos [Wed, 12 Apr 2017 20:49:06 +0000 (22:49 +0200)]
configure: Fix decklink license dependency.
(cherry picked from commit a081acc44082e4124a11747139b9a329fe01736e)

2 years agoffprobe: only use custom logging callback if -show_log is set
Marton Balint [Wed, 5 Apr 2017 18:17:48 +0000 (20:17 +0200)]
ffprobe: only use custom logging callback if -show_log is set

The custom callback can cause significant CPU usage on Windows for some large
files with many index entries for some reason.

v2: Move check after parsing options.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agotests/fate/filter-video: fix framerate filter tests
Marton Balint [Sat, 8 Apr 2017 12:55:51 +0000 (14:55 +0200)]
tests/fate/filter-video: fix framerate filter tests

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavfilter/vf_framerate: always request input if no output is provided in request_frame
Marton Balint [Tue, 4 Apr 2017 23:41:15 +0000 (01:41 +0200)]
avfilter/vf_framerate: always request input if no output is provided in request_frame

Fixes ticket #6285.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoadd release notes based on release 3.2
Michael Niedermayer [Wed, 12 Apr 2017 00:26:45 +0000 (02:26 +0200)]
add release notes based on release 3.2

Name suggestion was from Tobias Rapp and Bodecs Bela

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoUpdate for 3.3
Michael Niedermayer [Wed, 12 Apr 2017 00:24:58 +0000 (02:24 +0200)]
Update for 3.3

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/APIchanges: Fill in missing fields
Michael Niedermayer [Wed, 12 Apr 2017 00:01:37 +0000 (02:01 +0200)]
doc/APIchanges: Fill in missing fields

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5b441d2981f35e6183b0ac29fa89e089c91cf7ba)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparseogm: Check ff_alloc_extradata() for failure
Michael Niedermayer [Tue, 11 Apr 2017 13:08:07 +0000 (15:08 +0200)]
avformat/oggparseogm: Check ff_alloc_extradata() for failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9eff4b0d2b5013e1ede86cf1a152dce164217d52)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparseogm: Check available data before reading global header
Michael Niedermayer [Tue, 11 Apr 2017 13:06:21 +0000 (15:06 +0200)]
avformat/oggparseogm: Check available data before reading global header

Fixes use of uninitialized data

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 170d864d2c508ca8111b1d108e1e964007dab712)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/pixlet: Reorder rlen check
Michael Niedermayer [Sat, 8 Apr 2017 01:34:45 +0000 (03:34 +0200)]
avcodec/pixlet: Reorder rlen check

This changes nothing but is nicer looking as this checks rlen

Maybe this helps coverity remove CID1397743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c94d551ea7b39c4e467e146cd347c407e8eb38ee)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()
Michael Niedermayer [Sat, 8 Apr 2017 01:34:44 +0000 (03:34 +0200)]
avcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()

This should help coverity see that the issues this leads to cannot occur

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8dd0c12648d838bb982ca10f384ee1f0107dfece)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agompegvideo_enc: disable optimized huffman coding with AMV or slice threads
Rostislav Pehlivanov [Tue, 4 Apr 2017 09:58:37 +0000 (10:58 +0100)]
mpegvideo_enc: disable optimized huffman coding with AMV or slice threads

Doesn't work yet with slice threading and won't work with AMV.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 03eb0515c12637dbd20c2e3ca8503d7b47cf583a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoRevert "mjpegenc: disable huffman coding with AMV"
Michael Niedermayer [Sun, 9 Apr 2017 19:51:33 +0000 (21:51 +0200)]
Revert "mjpegenc: disable huffman coding with AMV"

This was the wrong patch

This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.

(cherry picked from commit 724bb805ef8a6de0d9ef27a083ef501bdef2d453)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/examples/decode_video: Fix format string vulnerability
Michael Niedermayer [Fri, 7 Apr 2017 21:05:57 +0000 (23:05 +0200)]
doc/examples/decode_video: Fix format string vulnerability

Fixes: CID1404843

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 23edd41a0d6994cb5d9983d8f035e8eef78960ad)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoRevert "avutil/avstring: add av_strreplace API into avstring"
Steven Liu [Tue, 11 Apr 2017 00:05:54 +0000 (08:05 +0800)]
Revert "avutil/avstring: add av_strreplace API into avstring"

This reverts commit 99e5d81ef997cb88b1a40e6f253f37f7cbf251d9.

2 years agomjpegenc: disable huffman coding with AMV
Rostislav Pehlivanov [Mon, 3 Apr 2017 20:13:29 +0000 (21:13 +0100)]
mjpegenc: disable huffman coding with AMV

Isn't supported.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
(cherry picked from commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8)
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agomjpegenc_common: check for codec ID before using avctx->priv_data
Rostislav Pehlivanov [Mon, 3 Apr 2017 20:13:28 +0000 (21:13 +0100)]
mjpegenc_common: check for codec ID before using avctx->priv_data

When coding lossless jpeg the priv context will be pointing to LJpegEncContext
rather than MpegEncContext, which the function expects.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
(cherry picked from commit 2c9be3882a03823413945bd9e2d9af33e6e322d5)
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agoavformat/matroskaenc: don't try to update flac extradata if live streaming
James Almer [Sat, 8 Apr 2017 18:44:53 +0000 (15:44 -0300)]
avformat/matroskaenc: don't try to update flac extradata if live streaming

(cherry picked from commit a8b5f375010912abd9d41bde0992c63a548d56a6)

2 years agoavformat/mov: Check creation_time for overflow
Michael Niedermayer [Sat, 1 Apr 2017 17:18:36 +0000 (19:18 +0200)]
avformat/mov: Check creation_time for overflow

Fixes integer overflow
Fixes: 701640

Found-by: Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 39ee3ddff87a12e108fc4e0d36f756d0ca080472)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dvdsubdec: Fixes 2 runtime error: left shift of 170 by 24 places cannot be...
Michael Niedermayer [Fri, 7 Apr 2017 01:36:17 +0000 (03:36 +0200)]
avcodec/dvdsubdec: Fixes 2 runtime error: left shift of 170 by 24 places cannot be represented in type 'int'

Fixes: 619/clusterfuzz-testcase-5803914534322176

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 61ee2ca7758672128e30b3e87908b6845e006d71)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/h264: Check weight values to be within the specs limits.
Michael Niedermayer [Tue, 21 Mar 2017 22:46:14 +0000 (23:46 +0100)]
avcodec/h264: Check weight values to be within the specs limits.

Fixes: integer overflows
Fixes: 911/clusterfuzz-testcase-5415105606975488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 08117a40157464f8a9dcc2df393fa5fe299c1e98)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolibavformat/mov: Fix memory leak, need to free the chapter tracks array
Thierry Foucu [Wed, 5 Apr 2017 20:23:31 +0000 (13:23 -0700)]
libavformat/mov: Fix memory leak, need to free the chapter tracks array

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ac24a8202a6fdfb469af1fa68d537fb2f8d1ba6a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoChangelog: fix position of VAAPI MPEG-2/VP8 encode entry
Mark Thompson [Sun, 2 Apr 2017 21:55:33 +0000 (22:55 +0100)]
Changelog: fix position of VAAPI MPEG-2/VP8 encode entry

This was merged in the wrong place.

(cherry picked from commit 3cbf717425b68ef1a731147748edd5c087af15a1)

2 years agoChangelog: add missing entry for VP8 QSV decoder
James Almer [Sun, 2 Apr 2017 21:39:01 +0000 (18:39 -0300)]
Changelog: add missing entry for VP8 QSV decoder

(cherry picked from commit 7ab9d3f341016b76927d0876a47a13137369eb40)

2 years agoChangelog: add 3.3
James Almer [Sun, 2 Apr 2017 21:39:47 +0000 (18:39 -0300)]
Changelog: add 3.3

2 years agobuild: Add missing object dependency for extract_extradata bitstream filter
Diego Biurrun [Sun, 2 Apr 2017 19:09:16 +0000 (16:09 -0300)]
build: Add missing object dependency for extract_extradata bitstream filter

Cherry-picked from libav commit cfee5e1a0fa892fadd19b8848545d62f2386a6e7

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit f8e29a371622316c68db7017ab04dd447b0114ba)

2 years agoBump minor for 3.3
Michael Niedermayer [Sun, 2 Apr 2017 17:49:45 +0000 (19:49 +0200)]
Bump minor for 3.3

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agocompat/atomics: fix atomic_fetch_xor
James Almer [Sun, 2 Apr 2017 03:57:17 +0000 (00:57 -0300)]
compat/atomics: fix atomic_fetch_xor

2 years agoavcodec/extract_extradata_bsf: make sure all parameter set NAL units were found for...
James Almer [Sat, 25 Mar 2017 01:37:34 +0000 (22:37 -0300)]
avcodec/extract_extradata_bsf: make sure all parameter set NAL units were found for h264/hevc

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/oggparsedaala: Do not leave an invalid value in gpshift
Michael Niedermayer [Sat, 1 Apr 2017 17:18:35 +0000 (19:18 +0200)]
avformat/oggparsedaala: Do not leave an invalid value in gpshift

Fixes: undefined behavior
Fixes: 702974

Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparsedaala: Check duration for AV_NOPTS_VALUE
Michael Niedermayer [Sat, 1 Apr 2017 17:18:34 +0000 (19:18 +0200)]
avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE

This avoids an integer overflow
the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500

Fixes: 700242

Found-by: Thomas Guilbert <tguilbert@google.com>
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agofate: add bitexact sws_flags to hevc-extradata-reload
James Almer [Sat, 1 Apr 2017 16:38:50 +0000 (13:38 -0300)]
fate: add bitexact sws_flags to hevc-extradata-reload

Makes the test output consistent across all targets.

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:40 +0000 (18:53 +0200)]
Merge commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'

* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '5a1d605ceae448b476a525f7368ec452000d1f26'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:36 +0000 (18:53 +0200)]
Merge commit '5a1d605ceae448b476a525f7368ec452000d1f26'

* commit '5a1d605ceae448b476a525f7368ec452000d1f26':
  hwcontext_dxva2: split transfer_data() into upload/download functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '9d7026574bbbe67d004a1c32911da75375692967'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:32 +0000 (18:53 +0200)]
Merge commit '9d7026574bbbe67d004a1c32911da75375692967'

* commit '9d7026574bbbe67d004a1c32911da75375692967':
  hwcontext_dxva2: fix handling of the mapping flags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'
Hendrik Leppkes [Sat, 1 Apr 2017 16:53:27 +0000 (18:53 +0200)]
Merge commit '0d3176e32f351d18d6174d8b05796829a75a4c6b'

* commit '0d3176e32f351d18d6174d8b05796829a75a4c6b':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoavcodec/dnxhdenc: fix indentation issue
Paul B Mahol [Sat, 1 Apr 2017 16:50:30 +0000 (18:50 +0200)]
avcodec/dnxhdenc: fix indentation issue

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/dnxhdenc: DNxHR 444 and HQX support
Paul B Mahol [Sat, 25 Mar 2017 19:19:26 +0000 (20:19 +0100)]
avcodec/dnxhdenc: DNxHR 444 and HQX support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoMerge commit 'adb0e941c329a4778ade6dd0a326274472992f54'
Clément Bœsch [Sat, 1 Apr 2017 16:22:21 +0000 (18:22 +0200)]
Merge commit 'adb0e941c329a4778ade6dd0a326274472992f54'

* commit 'adb0e941c329a4778ade6dd0a326274472992f54':
  avpacket: Mark src pointer as constant

See 5bb3f8825584a319b25b430e4ece2fa5b2b47ff9

Merged-by: Clément Bœsch <u@pkh.me>
2 years agodoc/libav-merge: document hlsenc encryption state
Clément Bœsch [Sat, 1 Apr 2017 16:21:11 +0000 (18:21 +0200)]
doc/libav-merge: document hlsenc encryption state

2 years agoMerge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'
Clément Bœsch [Sat, 1 Apr 2017 16:17:02 +0000 (18:17 +0200)]
Merge commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2'

* commit '0a4b9d0ccd10b3c39105f99bd320f696f69a75a2':
  hlsenc: Add encryption support

This commit is a noop, see 907ac20aa29341e49a4f89ff3d4240d92f9a0cb9

Note that this commit differs from our encryption support in various
ways so it may need some adjustments in the future.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/exr: add support for scanline file where offsets are set to zero
Dzung Hoang [Sat, 25 Mar 2017 11:40:08 +0000 (12:40 +0100)]
avcodec/exr: add support for scanline file where offsets are set to zero

2 years agovf_deinterlace_vaapi: Mark as hwframe-aware
Mark Thompson [Sat, 1 Apr 2017 14:32:17 +0000 (15:32 +0100)]
vf_deinterlace_vaapi: Mark as hwframe-aware

Commits ade370a4 and e3fb74f7 were reordered while merging, so this
change got lost.

2 years agoMerge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'
Clément Bœsch [Sat, 1 Apr 2017 13:39:57 +0000 (15:39 +0200)]
Merge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'

* commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88':
  crypto: Add encryption support

See 00d4013d9f841c189a2f10dd05526ca40129b880

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb'
Clément Bœsch [Sat, 1 Apr 2017 13:15:19 +0000 (15:15 +0200)]
Merge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb'

* commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb':
  qsvdec: Drop stray extra braces around initializer

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '715b8243460836fb7dd15bf7e41668e773beb276'
Clément Bœsch [Sat, 1 Apr 2017 13:14:31 +0000 (15:14 +0200)]
Merge commit '715b8243460836fb7dd15bf7e41668e773beb276'

* commit '715b8243460836fb7dd15bf7e41668e773beb276':
  qsv: Drop some unused variables

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/dsddec: correct for DSD silence bit-ordering
Takayuki 'January June' Suwa [Fri, 31 Mar 2017 17:14:13 +0000 (02:14 +0900)]
avcodec/dsddec: correct for DSD silence bit-ordering

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit 'bb265b764a055f2dc576b9aec62460d9580868f4'
Clément Bœsch [Sat, 1 Apr 2017 10:46:09 +0000 (12:46 +0200)]
Merge commit 'bb265b764a055f2dc576b9aec62460d9580868f4'

* commit 'bb265b764a055f2dc576b9aec62460d9580868f4':
  examples/transcode_aac: Drop pointless return value const qualifier

This commit is a noop, the function doesn't exist in FFmpeg anymore
since e181e2909b214e043016c108ea0bc3b8094fc63b.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agodoc/examples/transcode_aac: replace local get_error_text with av_err2str
Clément Bœsch [Sat, 1 Apr 2017 10:45:33 +0000 (12:45 +0200)]
doc/examples/transcode_aac: replace local get_error_text with av_err2str

2 years agoMerge commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c'
Clément Bœsch [Sat, 1 Apr 2017 10:43:04 +0000 (12:43 +0200)]
Merge commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c'

* commit 'bfe92dfe60f601b3f20a918ffcc0acdf40a5955c':
  Ignore all generated example binaries

This commit is a noop, the .gitignore was updated during the merges of
these examples.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'
Clément Bœsch [Sat, 1 Apr 2017 10:41:42 +0000 (12:41 +0200)]
Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'

* commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f':
  doc: Add note about recent regression in AviSynth+

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'
Clément Bœsch [Sat, 1 Apr 2017 10:12:42 +0000 (12:12 +0200)]
Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'

* commit '3cc3463f306f425f76bd962755df1132eeac6dfa':
  avisynth: Support pix_fmts added to AviSynth+

This commit is mostly a noop, see
92916e8542e425ca20daddb490261a5818643206.

Cosmetics and a small fix are merged.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'
Clément Bœsch [Sat, 1 Apr 2017 10:11:24 +0000 (12:11 +0200)]
Merge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'

* commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9':
  avisynth: Simplify the pix_fmt check for the newer AviSynth API

This commit is a noop, see 0ed5c3ce81811dcd93f21cdd1204d4c68bca9654

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'
Clément Bœsch [Sat, 1 Apr 2017 10:09:50 +0000 (12:09 +0200)]
Merge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'

* commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b':
  avisynth: Fix setting stream timebase

This commit is a noop, see 8009a1f1fdce16a59ea911e2b768e56ec4c8e344

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'
Clément Bœsch [Sat, 1 Apr 2017 10:06:21 +0000 (12:06 +0200)]
Merge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'

* commit '481ff3cf018811ba3235f1c236e970f32a6300b9':
  fate: Add h264 and hevc extradata reload tests

Only the HEVC part is merged, see 00c80798160f930ce680f98f869c23d91a261f06

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a'
Clément Bœsch [Sat, 1 Apr 2017 09:59:47 +0000 (11:59 +0200)]
Merge commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a'

* commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a':
  mov: Fix identity matrix boolean logic

This commit is a noop, see 7010ebdf1ff7514fa505ff166fb60ce762a46b8b

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b'
Clément Bœsch [Sat, 1 Apr 2017 09:39:09 +0000 (11:39 +0200)]
Merge commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b'

* commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b':
  checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057'
Clément Bœsch [Sat, 1 Apr 2017 09:36:38 +0000 (11:36 +0200)]
Merge commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057'

* commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057':
  aarch64: vp9: loop filter: replace 'orr; cbn?z' with 'adds; b.{eq,ne};

This commit is a noop, see e7ae8f7a715843a5089d18e033afb3ee19ab3057

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc'
Clément Bœsch [Sat, 1 Apr 2017 09:32:53 +0000 (11:32 +0200)]
Merge commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc'

* commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc':
  aarch64: vp9: use alternative returns in the core loop filter function

This commit is a noop, see 62ea07d797c503bc4b727e56d9c0f914a93c8ef6

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'
Clément Bœsch [Sat, 1 Apr 2017 09:30:55 +0000 (11:30 +0200)]
Merge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'

* commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce':
  libilbc: support for latest git of libilbc

This commit is a noop, see 59af5383c18c8cf3fe2a4b5cc1ebf2f3300bdfe5

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'
Clément Bœsch [Sat, 1 Apr 2017 09:29:34 +0000 (11:29 +0200)]
Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'

* commit 'ffe89e1edb0281ff65d1bda88253784e9283b717':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'
Clément Bœsch [Sat, 1 Apr 2017 09:26:23 +0000 (11:26 +0200)]
Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'

* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'
Clément Bœsch [Sat, 1 Apr 2017 09:25:37 +0000 (11:25 +0200)]
Merge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'

* commit 'fbd1f7639d0142c391bec85d1d840c835210843f':
  af_asyncts: Use llabs instead of labs for 64-bit variable

This commit is a noop, see a8fe8d6b4a35c95aa94fccde5f001041278d197c

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'
Clément Bœsch [Sat, 1 Apr 2017 09:17:24 +0000 (11:17 +0200)]
Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'

* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
  qsv: Add VP8 decoder

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoconfigure: Fix GPL dependency for avisynth / avxsynth.
Carl Eugen Hoyos [Fri, 31 Mar 2017 23:09:19 +0000 (01:09 +0200)]
configure: Fix GPL dependency for avisynth / avxsynth.

2 years agoMerge commit '182cf170a544bce069c8690c90b49381150a1f10'
Clément Bœsch [Sat, 1 Apr 2017 07:55:12 +0000 (09:55 +0200)]
Merge commit '182cf170a544bce069c8690c90b49381150a1f10'

* commit '182cf170a544bce069c8690c90b49381150a1f10':
  vp8: Return stream format information from parser

Return codes are adjusted to consume the whole packet in case of error
as the API does not allow returning AVERROR codes (a negative return
value is valid).

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavutil/avstring: add av_strreplace API into avstring
Steven Liu [Sat, 1 Apr 2017 02:55:04 +0000 (10:55 +0800)]
avutil/avstring: add av_strreplace API into avstring

refer to: http://creativeandcritical.net/str-replace-c
add av_strreplace API for replace string operations.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agox86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5...
James Almer [Fri, 31 Mar 2017 23:42:16 +0000 (20:42 -0300)]
x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5796be34

See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html

2 years agodoc/libav-merge: link to the relevant ml thread in the extract_extradata line
James Almer [Fri, 31 Mar 2017 23:35:16 +0000 (20:35 -0300)]
doc/libav-merge: link to the relevant ml thread in the extract_extradata line

2 years agofate/exr : add test for uint32 data
Martin Vignali [Sat, 18 Mar 2017 12:45:06 +0000 (13:45 +0100)]
fate/exr : add test for uint32 data

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
James Almer [Fri, 31 Mar 2017 20:39:25 +0000 (17:39 -0300)]
Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'

* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

See fb57bc6c34b979bec995e714162fdfb4caf6db1a.
Merged for cosmetic purposes to reduce differences with libav.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
James Almer [Fri, 31 Mar 2017 20:18:37 +0000 (17:18 -0300)]
Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'

* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'
James Almer [Fri, 31 Mar 2017 20:14:10 +0000 (17:14 -0300)]
Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'

* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '030d84fa2e35af0e77516735de35bf1a52371c86'
James Almer [Fri, 31 Mar 2017 20:12:09 +0000 (17:12 -0300)]
Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86'

* commit '030d84fa2e35af0e77516735de35bf1a52371c86':
  qsvdec: Pass field order information to libmfx
  qsvdec: Pass the correct profile to libmfx

These commits are a noop, see 1f26a231bb065276cd80ce02957c759f3197edfa

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
James Almer [Fri, 31 Mar 2017 20:08:50 +0000 (17:08 -0300)]
Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'

* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a126c6c00cc60070de3190cf23f5570fb

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'
James Almer [Fri, 31 Mar 2017 20:01:34 +0000 (17:01 -0300)]
Merge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'

* commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97':
  aarch64: vp9: loop_filter: fix typo in skip flatout8 check
  aarch64: vp9: Implement NEON loop filters
  arm: vp9itxfm: Simplify txfm string comparisons

These commits are a noop, see
b4dc7c341eb08b6a4d5470a05364eadf85434108
f1212e472b5f57b4f7243fc46f254647cf7e284d

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'
James Almer [Fri, 31 Mar 2017 19:56:19 +0000 (16:56 -0300)]
Merge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'

* commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29':
  aarch64: vp9: Add NEON itxfm routines

This commit is a noop, see f43079e11cb445e6b70b149d9cdb829091ec2155

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/decode_audio: use <> to include libav* headers
James Almer [Fri, 31 Mar 2017 19:50:39 +0000 (16:50 -0300)]
doc/decode_audio: use <> to include libav* headers

Found-by: ubitux
2 years agoMerge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
James Almer [Fri, 31 Mar 2017 19:46:00 +0000 (16:46 -0300)]
Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'

* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'
James Almer [Fri, 31 Mar 2017 19:38:37 +0000 (16:38 -0300)]
Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'

* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd316f9cefcd854071985c6f524a9a15348240264'
James Almer [Fri, 31 Mar 2017 19:33:48 +0000 (16:33 -0300)]
Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'

* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
James Almer [Fri, 31 Mar 2017 19:28:35 +0000 (16:28 -0300)]
Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'
James Almer [Fri, 31 Mar 2017 19:25:23 +0000 (16:25 -0300)]
Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'

* commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125':
  nut: Use correct function pointer casts instead of void*

This commit is a noop. Casts are not needed.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
James Almer [Fri, 31 Mar 2017 19:19:30 +0000 (16:19 -0300)]
Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'

* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973'
James Almer [Fri, 31 Mar 2017 19:17:41 +0000 (16:17 -0300)]
Merge commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973'

* commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973':
  arm: vp9: Add NEON loop filters

This commit is a noop, see 6bec60a683a530ac3bf5a19e5c3d087b5dd047a1

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'
James Almer [Fri, 31 Mar 2017 19:13:04 +0000 (16:13 -0300)]
Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'

* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df11583800ee296effd42c51c65e9f3ef72

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'
James Almer [Fri, 31 Mar 2017 19:10:12 +0000 (16:10 -0300)]
Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'

* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

Merged-by: James Almer <jamrial@gmail.com>