* qatar/master:
  cmdutils: update copyright year to 2013
  h264: check SPS entries directly to detect pixel format changes
  forgotten changelogs for 9_beta2

Conflicts:
	Changelog
	cmdutils.c
	libavcodec/h264.c

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

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

Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.

The FATE test is updated because the line breaks in the dialogue
rectangles are now proper CRLF.

The data does not contain timing or trailing line breaks anymore. In
addition to being less idiotic, it is consistent with other codecs and
thus allows more switches between formats and codecs. It also fixes the
issue of the trailing line returns being simple \n instead of CRLF in
the ASS rectangle dialogue (this is the reason of the FATE update).

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

"que" sounds like a slang word to me. This commit renames a few
variables, fix the comments and the logging messages (sometimes along
with small other typo fixes).

This fixes a integer overflow in fate

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also add example showing cat piping images to ffmpeg.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Also improve overall consistency.

Similarly to 03f5043f5, we use the FTRAPV config setting.

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

The flags are necessary for the auto inserted scaler (because the
overlay filter needs an alpha channel for the overlay surface).

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

Illustrate the use of return values, av_err2str and
avcodec_get_name.

This flag is not necessary.

See 36e61e24.

Fixes Ticket646

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

Comparing AVCodecContext.pix_fmt against the get_pixel_format() return
value has the side effect of calling the get_format() callback on each
slice. Users of the callback will probably handle hardware accelerator
initialization in the callback.

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

Fixes Ticket2088

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

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

They were two very short files that cover ffmpeg-specific features.

Necessary after 04a530f.

Consider the color space as an hypercone with apex alpha=0
and base alpha=1 instead of an hypercube.
Make the encoder consider very transparent colors more similar
even if the hue is very different.
This corresponds roughly to using the alpha as a weight for the
color difference.
Only 4 bits of alpha are used, because this is what dvdsub uses,
and it avoids overflows.

Fix trac ticket #2005.

Use the first 64 bits of the SHA1 of the content as file UID
instead of a random number if the bitexact flag is set.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes #1697.

Fixes Ticket #2087.

This reverts commit 580ee973d1.

There can be only one track reference. The multiple tref handling is
handled at a different level.

Fix trac ticket #2083.

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

This was broken in 0d96ec19eb under the
assumption that there is only one tref leaf atom.

Fixes Ticket #2081.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  rtmp: Add support for limelight authentication
  rtmp: Add support for adobe authentication

Conflicts:
	Changelog
	libavformat/version.h

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