* commit '79dad2a9':
  dsputil: Separate h264chroma

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

This is unnecessary, as ff_flac_set_channel_layout can handle any number of channels.

Non-ascii chars are not correctly rendered in both MAN and HTML output or
may even cause compilation failure. Thus avoid to use them until we find
a satisfying way to deal with them.

Fix trac ticket #2243.

The DTS needs to be resynched against the segment start PTS, or the
resulting DTS may result < PTS.
Reported-by: Owen Jones <riots6@gmail.com>

See thread:
Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD
Date: Sat, 19 Jan 2013 08:58:27 +0000

Fixes ticket #1764.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* rdp/combined2:
  dshow: allow for more codec ID's
  dshow: better error reporting
  dshow: fix log message
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Modified the fate test crc generator to print the side_data's
crc if side_data is present.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mpegvideo: initialize dummy reference frames.

Conflicts:
	libavcodec/mpegvideo.c
	tests/ref/fate/filter-yadif-mode1

The luma init is left at 0x80 as it was previously, and tested and
working since a long time. Its also mandated to be 0x80 by at least
one specification. Cases that need different values already had
code in place to handle them.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'dff6197d':
  nuv: do not rely on get_buffer() initializing the frame.
  yop: initialize palette to 0

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg-fh
	tests/ref/fate/yop
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8136f234':
  yop: check for input overreads.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '06cf597c':
  yop: check that extradata is large enough.

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

* commit '89f11f49':
  qtrle: fix the topmost line for 1bit

Conflicts:
	tests/ref/fate/qtrle-1bit

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

* commit '685e6f2e':
  xxan: properly handle odd heights.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2cd40680':
  fraps: fix off-by one bug for version 1.

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

* commit 'da7baaaa':
  aasc: fix output for msrle compression.
  msrledec: check bounds before constructing a possibly invalid pointer,
  cmdutils: remove ansi from the list of broken codecs.

Conflicts:
	tests/ref/fate/aasc

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

* commit '238614de':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

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

* commit '48a4ffa7':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

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

They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2

Signed-off-by: James Almer <jamrial@gmail.com>

* commit '620289a2':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '25841dfe':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

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

Do not rely on get_buffer initializing them.

Changes yadif tests (off by one in one border pixel), because yadif
reads from those uninitialized lines.

CC:libav-stable@libav.org

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org

Duplicate the last one or two chroma lines.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
CC:libav-stable@libav.org

CC:libav-stable@libav.org

The bottom line was invalid before.

CC:libav-stable@libav.org

Setting it to zero (instead of 128, as the default get_buffer() does)
also produces more correctly-looking output.

The FATE sample contains some pixels with value 0, but the palette
stored in the file contains only values from 16 up. Because the default
and cmdutils get_buffer() initialize the data to 0x80, they appear as
gray dots.
After this commit they change to black dots, which is probably still
incorrect but less visible and doesn't rely on get_buffer() initializing
the data.

CC:libav-stable@libav.org