* commit 'b805482b':
  aac: Provide more information on the failure message
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c5eb279e':
  g723: Add missing header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '1077d8c8':
  configure: Add -framework CoreVideo when building the avfoundation indev
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'bf12a81c':
  configure: Replace `pr` since it is not provided by busybox

Not merged as requested by Timothy Gu.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5f3a081b':
  avi: Spin out the logic to position to the next non-interleaved stream
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Don't print a warning when dcadec_context_filter() returns positive
warning code. Most relevant warnings are now output through the callback
function.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Take request_channel_layout as a hint and don't force 2.0 downmix by
using both the 2CH and 6CH flags together.

Remove warnings about missing coefficients because they are no longer
relevant.

Honor AV_CH_LAYOUT_NATIVE and make it possible for native DTS channel
layout to be output.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Regression since 53f2ef2c.
Fixes ticket #5017.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fix regression since a8bb81a0.

Spotted-by: RiCON

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

* commit 'cb49bb10':
  build: Move -Wcast-qual to the extra_warnings
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '0fc61c6a':
  avi: Validate the stream-id for DV as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'd017ed87':
  avi: Use the correct data type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7f57ea14':
  vsrc_color: Drop unneeded variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'ca5f386e':
  lavf: G.723.1 muxer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f023d57d':
  lavc: G.723.1 encoder

Split existing FFmpeg G.723.1 encoder into a new file.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '165cc6fb':
  g723_1: Move sharable functions to a separate file
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'aac996cc':
  g723_1: Rename files to better reflect their purpose
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b74b88f3':
  g723_1: Handle values at the ends of the table in lsp2lpc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a0fa6d06':
  matroska: Warn when metadata references a non-existent element
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f7986239':
  dvenc: Validate the frame size before copying it
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '7139489c':
  pgssubdec: fix API compability layer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'b0e8651a':
  doc: Amend the MSYS2 Documentation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '4f979418':
  avfoundation: Simple capture

Not merged on request by Thilo Borgmann, original author of the
AVFoundation capture in FFmpeg.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fix a dead lock under certain conditions. Let's assume we have a queue of 1
message max, 2 senders, and 1 receiver.

Scenario (real record obtained with debug added):
    [...]
    SENDER #0: acquired lock
    SENDER #0: queue is full, wait
    SENDER #1: acquired lock
    SENDER #1: queue is full, wait
    RECEIVER: acquired lock
    RECEIVER: reading a msg from the queue
    RECEIVER: signal the cond
    RECEIVER: acquired lock
    RECEIVER: queue is empty, wait
    SENDER #0: writing a msg the queue
    SENDER #0: signal the cond
    SENDER #0: acquired lock
    SENDER #0: queue is full, wait
    SENDER #1: queue is full, wait

Translated:
 - initially the queue contains 1/1 message with 2 senders blocking on
   it, waiting to push another message.
 - Meanwhile the receiver is obtaining the lock, read the message,
   signal & release the lock. For some reason it is able to acquire the
   lock again before the signal wakes up one of the sender. Since it
   just emptied the queue, the reader waits for the queue to fill up
   again.
 - The signal finally reaches one of the sender, which writes a message
   and then signal the condition. Unfortunately, instead of waking up
   the reader, it actually wakes up the other worker (signal = notify
   the condition just for 1 waiter), who can't push another message in
   the queue because it's full.
 - Meanwhile, the receiver is still waiting. Deadlock.

This scenario can be triggered with for example:
    tests/api/api-threadmessage-test 1 2 100 100 1 1000 1000

One working solution is to make av_thread_message_queue_{send,recv}()
call pthread_cond_broadcast() instead of pthread_cond_signal() so both
senders and receivers are unlocked when work is done (be it reading or
writing).

This second solution replaces the condition with two: one to notify the
senders, and one to notify the receivers. This prevents senders from
notifying other senders instead of a reader, and the other way around.
It also avoid broadcasting to everyone like the first solution, and is,
as a result in theory more optimized.