This subfilter gives a different output when linesize and width are
differents.

Commands are equivalent at this point.

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

improves playback of ac3 in RealPlayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  8bps: cosmetics
  aasc: cosmetics, reformat
  ansi: remove an extra return
  asvdec: cosmetics, reformat
  aura: cosmetics, reformat

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

* commit 'b047c687':
  4xm: don't rely on get_buffer() initializing the frame.
  huffyuv: split encoder and decoder into separate files.
  lavc: make pkt_{p,d}ts doxy less confusing

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

* commit '418693bd':
  lavc: rewrite and extend AVFrame doxy
  opt: avoid segfault in av_opt_next() if the class does not have an option list
  ttadec: fix last frame handling when seeking
  alacdec: do not be too strict about the extradata size

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

Remove some pointless comments and empty lines.

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

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

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

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

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

Improve robustness.

CC: libav-stable@libav.org

Using a frame count, as is done currently, does not work at all with
seeking. Instead, when the number of samples in the final frame has
been decoded, we check if only the 32-bit CRC is remaining. If so, we
assume that it is the final frame.

There is no longer a need to keep total_frames in TTAContext.

Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Improves the file from Ticket2050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Sometimes the extradata has duplicate atoms, but that shouldn't prevent
decoding. Just ensure that it is at least 36 bytes as a sanity check.

CC: libav-stable@libav.org

Escaping the '=' is not necessary, and quoting the arguments allow to
remove the comma escaping as well.

Simplify.

* qatar/master:
  flac: only set channel layout if not previously set or on channel count change
  prepare 9_beta3 release

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

Fixes Bug 402

Fixes Ticket2050
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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