Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'

* commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10':
  avcodec options: add enum option for color_primaries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'

* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
  avcodec options: add enum option for color_trc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'

* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
  avcodec options: add enum option for colorspace

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'

* commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362':
  avcodec options: add enum option for color_range

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'

* commit '103243ca649cc305129ed0352bf4d97e5ddf4d80':
  oggenc: Set the right AVOption size for the pref_duration option

See: 536baf6cc5d1db789c9f903776dccb7a41b62a6e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'

* commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba':
  adpcm: Avoid reading out of bounds in the IMA QT trellis encoder

See: a32765c4252eb106a2ade543026ef6f59e699bfa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/libvpxenc: Update the "cpu-used" options default to match the "speed" alias

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vorbisdec: Reset first_frame

This avoids returning a initial frame after seeking which does
not match what would be received when decoding from the begin.

Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.

Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/udp: fix build on MINIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avdevice/lavfi: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_aphaser: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_channelmap: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_amix: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/tta: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/tscc2: fix macro ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt: remove unused variable and undocumented and not working command line option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: support setting AVStream.discard

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevc_sei: fix invalid get_bits() in a comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>