Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
	configure

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

* commit 'b769cf4b44c8112827c2fdfcab74bd95600fd6d3':
  hevc: do not dereference pointer before NULL check in verify_md5()

See: f2eca8d06060b9ec265c21ae38b6dd3088c52cc6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '33452aede6acab78f726cd1924824585f00765cc'

* commit '33452aede6acab78f726cd1924824585f00765cc':
  hevc: store the VPS list as an AVBufferRef, just like the others *PS

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9'

* commit '17a10d51b8351ce9a57fcb6537b6a3c6ec8ba5e9':
  hevc: set time_base when possible

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

* commit 'eb891b3114f499e96b9faddd0b0ae856345dfbd9':
  Replace all uses of avcodec_free_frame with av_frame_free().

Conflicts:
	doc/examples/decoding_encoding.c

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

* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
  lavc: deprecate avcodec_free_frame()

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

* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c

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

* commit '95a8a5aca60ce37d3abdf121a0285c2e317cf521':
  lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().

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

* commit '84f131921ffb43d8070d5680e91f6a24d66ccac4':
  avplay: do not call avcodec_get_frame_defaults().

Conflicts:
	ffplay.c

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

* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

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

* commit '2d1f4288dd02a624cb8b86ab06371d6434c9da69':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().

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

* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().

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

* commit '48d17ee6dc2b2a552f645484f200c2946bf24607':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().

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

* commit '598ce4ab4f1893e0661fc038101487e511937877':
  h264: call av_frame_unref() instead of avcodec_get_frame_defaults().

Conflicts:
	libavcodec/h264.c

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

* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
  lavc: deprecate avcodec_get_frame_defaults().

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/oggdec: reset end_trimming in ogg_reset()

Fixes the output when seeking back to the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mp3adu: Set the channel layout properly

This fixes decoding, broken since 7e35037.

This is similar to what was done for the normal mp3 decoder in
f4a86bc9.

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mp3adu: Set the channel layout properly

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