* commit '9affa784':
  vp9 encoder: use a decent default speed setting

Conflicts:
	libavcodec/libvpxenc.c

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

* commit '74bc9458':
  flvenc: Don't over-count metadata.

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '49106844':
  tiffenc: fix packet size calculation

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

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

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

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

Over-counting occurs if framerate is not set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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

* commit 'fe4d5fe9':
  jpeg2000: Mark static data init functions as av_cold

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

Its handled by the generic option code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '71d6551e':
  avconv: use the correct variable in comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Show the copyright when running `ffmpeg -version'. This is useful for
end users trying to determine whether they are using FFmpeg or Libav.
Signed-off-by: Simon Thelen <ffmpeg@c-14.de>

also remove spinlock, it doesnt work on AIX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids writing entries twice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

* commit '83aa4fc3':
  configure: Directly support Android as target OS
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '766f2d96':
  gitignore: add dylib and swp entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '711aa2a8':
  lavf: dump stream side data when probing

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

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

* commit '2dc26561':
  lavf: group dump functions together

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

* commit '5a69ded1':
  vf_showinfo: print display transformation values
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It was previously untested.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>