* commit 'bddd8cbf':
  Add transformation matrix API.

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

* commit '9929b356':
  pthread_frame: simplify the code by using new AVPacket API

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

* commit 'cdf58f05':
  avpacket: fix copying side data in av_packet_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a312f710':
  lavf: deprecate now unused AVStream.pts

Conflicts:
	libavformat/mux.c
	libavformat/version.h

mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed7922fa':
  mux: drop one of the hacks comprising compute_pkt_fields2()

Conflicts:
	libavformat/mux.c

Not merged as -async drop / -vsync drop depends on this code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this prevents the creation of a packet even though no single sample has ever
been input, which some confusion in the timestamp generation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

dts is not optional, its required for muxing,
previously it was set from AVStream.pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes 1 frame error in the duration and derived values,
introduced by not using AVStream.pts in the previous commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'dc40d886':
  avconv: do not use poorly defined and undocumented AVStream.pts

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

* commit 'c9f8809e':
  hevc/intra_pred: simplify neighboring sample derivation

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

* commit '25bb7eaf':
  hevc/intra_pred: drop unnecessary conditions in loops

Conflicts:
	libavcodec/hevcpred_template.c

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

* commit '4c390b1b':
  hevc/intra_pred: optimize EXTEND_()*

Conflicts:
	libavcodec/hevcpred_template.c

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

* commit 'a1c2b480':
  hevc: templatize intra_pred

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

* commit '04db5794':
  hevc: templatize pred_planar

Conflicts:
	libavcodec/hevcpred_template.c

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

Add AV_PKT_DATA_DISPLAYMATRIX and AV_FRAME_DATA_DISPLAYMATRIX as stream and
frame side data (respectively) to describe a display transformation matrix
for linear transformation operations on the decoded video.

Add functions to easily extract a rotation angle from a matrix and
conversely to setup a matrix for a given rotation angle.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

This also handles side data properly.

Side data count is incremented by by calling av_packet_new_side_data()
in the following loop, setting it explicitly results in the resulting
value being twice what it should be.

CC: libav-stable@libav.org

All encoders should output proper timestamps now.

Use OutputStream.last_mux_dts as an approximation of 'current' output
time instead.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Process 4 pixels at once.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes out of array accesses for non default buffers with large strides
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes playback with WMP 9 for files with large (rawvideo) frames
as explained in ticket #2145.

Fixes ticket #2818.

Also remove a couple unnecessary cmps
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids misleading encoder names like "encoder = prores"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ba5299a':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Alternatively every fate test could be changed to pass both fflags and flags +bitexact
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6656370b':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd246231e':
  wavenc: use codec descriptors to get the codec name

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

* commit '968a62a9':
  doc/APIchanges: mark the release 10 branch point

Conflicts:
	doc/APIchanges

Not merged, as there was no such branch in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '33082af7':
  doc/APIchanges: fill in missing hashes and dates

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

This mirrors the demuxer behaviour and avoids accessing
AVCodecContext.codec, which should not be done in muxers.