* commit 'bacc2869':
  mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '09cb75cd':
  libx264: set frame packing information when relevant information is found

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

* commit '5b10ef72':
  h264: parse frame packing arrangement SEI messages and save relevant stereo3d information

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

* commit '7e244c68':
  avframe: add codec-independent stereoscopic metadata

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

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd64341e4':
  configure: Prefix libc-related variables with "libc_"

Conflicts:
	libavdevice/Makefile
	libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Fix remuxing of IMA_QT in mov.
  Do not detect "00000000..." (and other non-changing values) as adp.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '61b203ff':
  configure: detect Solaris libc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b8d11a7':
  avcodec: Use av_reallocp where suitable

Conflicts:
	libavcodec/bitstream.c
	libavcodec/eatgv.c
	libavcodec/flashsv.c
	libavcodec/libtheoraenc.c
	libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4f1188d':
  dv: use AVFrame API properly

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

* commit 'c9ca220e':
  ac3dec: make drc_scale exponentially
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '37a74901':
  lavc: rework handling of refcounted_frames=0

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

* commit 'df7aba52':
  frame: cosmetics, reindent

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

* commit 'c342132f':
  frame: copy flags in av_frame_copy_props()

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

* commit 'a1ee1648':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

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

* commit '85f947ae':
  lavc: remove a pointless check in decode_audio4()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd4f0f2d1':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

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

* commit 'e5419709':
  lavc: remove the extended_data workarounds.

Conflicts:
	libavcodec/utils.c

One hunk is not merged as not all codecs are updated yet
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #1603.

* commit 'd351ef47':
  pthread_frame: use the AVFrame API properly.

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

Muxing VP6 is used by applications and works with Flashplayer.

Reported-by: David Bertrand

* commit 'b605b123':
  mxpegdec: use the AVFrame API properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'afa21a12':
  p*menc: use the AVFrame API properly.

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

* commit 'e2274aa5':
  mjpegdec: use the AVFrame API properly.

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b2)

Conflicts:

	libavcodec/jpeglsdec.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f0b234ab':
  avformat: AviSynth demuxer rewrite

Conflicts:
	configure
	libavformat/avisynth.c

See: b9ad0094 (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Simplifies host/target libc detection splitting.

Add preprocessor flags for API availability as necessary.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Martin Storsjö <martin@martin.st>

The a52 spec suggests that "partial compression" should scale the
drc value in this manner.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Use only proper AVFrame API (no assigning of whole frames, since that
hardcodes sizeof(AVFrame) into lavc).

Make a copy of the side data, so the caller can use av_frame_unref/free
on non-refcounted frames, eliminating the need for
avcodec_get_frame_defaults()/avcodec_free_frame().

Flags can be considered metadata (at least those that are defined now).

Not just on failure. This is the same thing that is done in the audio
path and should prevent leaks in decoders that allocate a frame, but
then end up not writing into it.