* commit 'd2869aea':
  dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '24f45c16':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
	libavcodec/fft-test.c
	tests/fate/fft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5ec6d152':
  indeo4: B-frames decoding

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

* commit '422e14f7':
  indeo2: rename stride to pitch for consistency with other Indeo decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a5864e9a':
  output example: free the muxing format context properly

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

* commit '182d3f82':
  output example: rewrite encoding logic

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

* commit 'a7fcd412':
  output example: store the scaling context in the stream context

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

* commit '6a927d7a':
  output example: use a macro instead of a static variable

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

* commit '63fd0d86':
  output example: allocate the audio frame only once

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

* commit 'edd5f957':
  output example: use OutputStream for audio streams as well

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

* commit '5e7b125b':
  output example: use the new AVFrame API to allocate audio frames

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

* commit 'ac85f631':
  output example: set output channel layout

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

* commit '294daf71':
  output example: use a struct to bundle the video stream variables together

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

* commit '38d04442':
  output example: use the new AVFrame API for allocating the video frame

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

* commit '3f4edf01':
  dump_stream: print the timebase as is, do not reduce it

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

* commit '1b04eb20':
  lavc: do not allocate edges in the default get_buffer2()

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

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

* commit 'a0e1c351':
  hevc: remove unused array min_cb_addr_zs

Conflicts:
	libavcodec/hevc_ps.c

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

* commit '9b60d919':
  hevc: Allow out of bound values for num_reorder_pics

Conflicts:
	libavcodec/hevc_ps.c

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

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

This also changes hfix8_mmx and above to use mmx regs instead of
gprs, and makes emulated_edge_mc_sse and emulated_edge_mc_sse2 use
mmxext hfix and hvar functions instead of mmx where possible.

This is mostly in preparation for an ssse3 version.
Signed-off-by: James Almer <jamrial@gmail.com>

code is about 1 cpu cycle faster approximately
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Properly generate pts for the frames sent to the encoder, avoid
using private and deprecated AVStream.pts.

It makes more sense to print the timebase exactly as it is set. Also,
this avoids a divide by zero when av_dump_format() is called on a format
context before writing the header.

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

in this case current MB size is forced to 16x16 (AVS standard section 9.9.1)
Signed-off-by: Yao Wang <jiayaowang@gmail.com>
Fixes Ticket 1901
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes decoding for a sample that cannot be shared
Signed-off-by: Anton Khirnov <anton@khirnov.net>

* commit '593d2326':
  dv: Replace a magic number by sizeof()

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