* commit 'a2eeed61':
  changelog: drop redundant new attribute

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

* commit 'ae9d13f0':
  img2: add stereo 3d still picture file extensions

Conflicts:
	libavformat/img2.c

See: 6fe12c7fMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46c0cbd5':
  rtsp: suppress a incompatible pointer types warning

Conflicts:
	libavformat/rtsp.c

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

* commit '6b45f05e':
  parseutils: fix discarding const attribute warning

Conflicts:
	libavutil/parseutils.c

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

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

Regression since 39d11d59

os->pduration would be wrongly assigned a negative value on invalid packets
instead of aborting.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mp3adu: Set the channel layout properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This fixes decoding, broken since 7e350379.

This is similar to what was done for the normal mp3 decoder in
f4a86bc9.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Fixes the output when seeking back to the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  rtspdec: Fix keep-alive request for ACTi cameras
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '48d17ee6':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '281a40e1':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2d1f4288':
  mpegvideo: call av_frame_unref() instead of avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b06c8bce':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '95a8a5ac':
  lavc: call av_frame_unref() instead of avcodec_get_frame_defaults().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit '94313562':
  lavc: deprecate avcodec_free_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	doc/examples/decoding_encoding.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

See: 36658c97Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

Some ACTi cameras fail if "*" is passed as the URI.
Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Also bump libavcodec micro and add an APIchanges entry saying that
av_frame_* should now be used instead of the lavc AVFrame functions.

This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.

avcodec_decode_audio4() resets the frame itself.

avcodec_decode_*() resets the frame itself.

This is a temporary workaround to allow deprecating
avcodec_get_frame_defaults(). The proper solution will be using a
properly allocated AVFrame in Picture.

ff_mpeg_unref_picture() already resets the frame.