* commit 'ba6a49e6':
  configure: Clean up temporary files on interrupt
Merged-by: Clément Bœsch <u@pkh.me>

* commit '78489822':
  configure: Place all temporary files in one separate directory
Merged-by: Clément Bœsch <u@pkh.me>

* commit '11e225db':
  rtmp: Account for bytes_read wraparound

This commit is a noop, see 0849a0ebMerged-by: Clément Bœsch <u@pkh.me>

* commit 'ca6ae3b7':
  vaapi_encode: Add MPEG-2 support

This commit is a noop, see 3b95c7c1Merged-by: Clément Bœsch <u@pkh.me>

* commit '3c2717e4':
  dashenc: increase buffer time hint in the manifest
Merged-by: Clément Bœsch <u@pkh.me>

* commit '95f1004b':
  dashenc: add mandatory id to AdaptationSet and Period in manifest
Merged-by: Clément Bœsch <u@pkh.me>

* commit '1ae6cb7d':
  dashenc: fix ISO8601 UTC parsing
Merged-by: Clément Bœsch <u@pkh.me>

* commit '2bbb5abd':
  build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4
Merged-by: Clément Bœsch <u@pkh.me>

* commit '6151e912':
  build: Detect blocks C language extension and add it as VDA dependency
Merged-by: Clément Bœsch <u@pkh.me>

Some samples have their metadata track time_scale incorrectly set to 0
and the check introduced by a398f054
prevents playback of those samples. Setting the time_scale to 1 fixes
playback.

This avoids producing out of range or clipped samples.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]'
Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

The code mistook the first iteration sometimes as the end
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

See http://lists.ffmpeg.org/pipermail/ffmpeg-user/2017-April/035975.html
Parsed_filter_X could remain and user can override it with custom one.

Example:
ffplay -f lavfi "nullsrc=s=640x360,
sendcmd='1 drawtext@top reinit text=Hello; 2 drawtext@bottom reinit text=World',
drawtext@top=x=16:y=16:fontsize=20:fontcolor=Red:text='',
drawtext@bottom=x=16:y=340:fontsize=16:fontcolor=Blue:text=''"
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 150 is too large for 32-bit type 'int'

Fixes: 1681/clusterfuzz-testcase-minimized-5970545365483520

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: 1674/clusterfuzz-testcase-minimized-6092531563495424
Fixes: 1686/clusterfuzz-testcase-minimized-6282691643179008

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f96d07f4':
  configure: Add quotes around a variable which might be empty
Merged-by: Clément Bœsch <u@pkh.me>

* commit '562ef82d':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5eMerged-by: Clément Bœsch <u@pkh.me>

* commit '9bf262f4':
  configure: Use proper compiler-specific speed flags for hostcc
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'bf38959a':
  configure: Move optflags checks to a more sensible place
Merged-by: Clément Bœsch <u@pkh.me>

* commit '381a4e31':
  tak: Convert to the new bitstream reader
  magicyuv: Convert to the new bitstream reader
  truemotion2rt: Convert to the new bitstream reader
  wavpack: Convert to the new bitstream reader
  mpc: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: Clément Bœsch <u@pkh.me>

* commit 'b83aea73':
  des-test: Pass the proper types to av_des_*() functions

See 183c3fa4Merged-by: Clément Bœsch <u@pkh.me>

* commit '5c0e2b13':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b3674533Merged-by: Clément Bœsch <u@pkh.me>

* commit '7ff018c1':
  OS/2: Try to commit memory above 1GB
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'fd8de7f2':
  dxtory: Convert to the new bitstream reader
  apedec: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: Clément Bœsch <u@pkh.me>

* commit 'b4a911c1':
  mpegvideoenc: make a table const
Merged-by: Clément Bœsch <u@pkh.me>

* commit '296eff4d':
  zmbvenc: get rid of a global table
Merged-by: Clément Bœsch <u@pkh.me>

* commit '00b775dd':
  hevc: Mark as having threadsafe init

This commit is a noop, see 14b90601Merged-by: Clément Bœsch <u@pkh.me>

* commit '54dcd228':
  als: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: Clément Bœsch <u@pkh.me>

* commit 'fb59f87c':
  nvenc: Explicitly push the cuda context on encoding

This commit is a noop, see be74ba64Merged-by: Clément Bœsch <u@pkh.me>

* commit '4795e4f6':
  alac: Convert to the new bitstream reader
  rtp: Convert to the new bitstream reader
  mov: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: Clément Bœsch <u@pkh.me>

* commit '44129e38':
  avconv: Do not pass NULL to avio_tell

This commit is a noop. The FFmpeg code handle cases where total_size is
an AVERROR (which avio_tell(NULL) will return) later in the function.

Note: the original commit refers to the null *muxer*. `ffmpeg -lavfi
testsrc -f null -` can be used as a test case.
Merged-by: Clément Bœsch <u@pkh.me>

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

Default settings have it too low.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 cannot be represented in type 'int'

Fixes: 1669/clusterfuzz-testcase-minimized-5287529198649344

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: asertion failure
Fixes: 1664/clusterfuzz-testcase-minimized-6587801187385344

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpegSigned-off-by: Michael Niedermayer <michael@niedermayer.cc>