vf_showinfo: print display transformation values
lavf: group dump functions together
lavf: dump stream side data when probing
gitignore: add dylib and swp entries
configure: Directly support Android as target OS
Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

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

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/dump: put copyright back from the file from which dump.c was split out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

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

Conflicts:
	libavformat/dump.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: use the correct level for droping non intra frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264_slice: support skipping loop filtering for non key frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: fix frame skip code

Fixes Ticket3475

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Force aix strip to work on 32 and 64 bit by default.
avcodec/bitstream: zero vlc tables on allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first

This avoids writing entries twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/bitstream: try to make vlc init code inherently thread safe

also remove spinlock, it doesnt work on AIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
version string: add copyright line to version string

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>
swscale/input: fix harmless integer overflow

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