* commit '213e6067':
  Replace av_unused attributes by block structures

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

* commit '096a1d5b':
  rdft: Move some variables into a separate block
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b574e1e9':
  get_bits: Add OPEN_READER macro variant w/o size_plus8

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

We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

There is no need to pass fd as a second parameter. Additionally remove
unneeded curly braces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Previously there was a limit of two cpuflags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is more portable and avoids warnings with compilers that do not
properly support av_unused.

This avoids an unused variable warning with hardcoded tables.

This avoids a trillion warnings from MSVC.

Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if
there is no palette defined.
Fixes ticket #3915
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

paddq is an SSE2 instruction so it cannot be used for MMX.

This was probably just a typo because the sums are dwords anyway.
Reviewed-by: Pascal Massimino <pascal.massimino@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'b21e989a':
  ismindex: produce .ismf file

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

Make time duration references consistent, using @ref links, and
eliminate incorrect syntax [-]HH[:MM[:SS[.m...]]].
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Also log an error message in case of invalid packet size.

This is a non-standard file that maps the MSS segment names to offsets
in the ISMV file. This can be used to build a custom MSS streaming
server without splitting the ISMV into separate files.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'd7913bf5':
  changelog: Move Ogg subtypes aliases entry to the correct release

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

Should fix compilation with old Yasm/Nasm versions.
Signed-off-by: James Almer <jamrial@gmail.com>

This makes more sense for future implementations of templates with zmm registers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

~20% faster than AVX.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

This avoids several failures on fate.ffmpeg.org, and thus makes real
bugs easier to spot
Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This lets the cglobal macro automatically append a suffix to the function name.
This means that INIT_XMM avx must be used rather than INIT_AVX.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

integration by Neil Birkbeck, with help from Vitor Sessak.
core SSE2 loop by Skal (pascal.massimino@gmail.com)
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9792b77':
  Mark 11 release in the changelog

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

* commit '12f0388f':
  Add release notes for 11.

Conflicts:
	doc/RELEASE_NOTES

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

* commit '4d55e9de':
  vc1: Split bits used in libavformat into a separate header

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

* commit 'f2051856':
  build: Split WMA frequencies into a separate object file

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

* commit '803f8992':
  build: cosmetics: Group hwaccel OBJS declarations together

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

* commit '2b8b0da0':
  fdctdsp: cosmetics: Drop one unnecessary if-block level
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Also fix some typos in the entries for the 11 release.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

This reduces inter-library dependencies.

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

from the flv spec, the flvtag define the tagtype as one byte,
the spec desc is:
Reserved  UB[2] Reserved for FMS, should be 0
Filter    UB[1] Indicates if packets are filtered.
                0 = No pre-processing required.
                1 = Pre-processing (such as decryption) of the packet is
                    required before it can be rendered.
                    Shall be 0 in unencrypted files, and 1 for encrypted
tags.
                    See Annex F. FLV Encryption for the use of filters.
TagType   UB[5] Type of contents in this tag. The following types are
                defined:
                        8 = audio
                        9 = video
                        18 = script data
Signed-off-by: Steven Liu <qi.liu@chinacache.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>