* commit '4a2a4524':
  ffv1: propagate errors

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

* commit '71f7b22d':
  ffv1: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This is not based on lucas work due to code divergence (its less work this way
than trying to merge from a split based on 2 years outdated code)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd15c21e5':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
	libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

The libav code depends on mp3 startcodes only occuring at the start of
frames. But there is nothing in mp3 that prevents them occuring elsewhere
by chance. Thus the code would fail randomly, the new code searches for 3
consecutive valid frames. If this turns out to be still insufficient the
number can be raised further, or additional checks added.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This should also fix CID717889.

Should fix CID733781 and CID733782.

Should fix CID733779 and CID733780.

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

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

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

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

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

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

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

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

Decrease confusion.

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

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

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

Fixes CID90539, CID90538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should fix fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Earlier versions of for instance of libavcodec expect this symbol to be
present in libavutil. This commit can be reverted after the next major
bump.

New shared builds of avcodec will link to the internal copy of the
table within that library, so those builds won't rely on this table
being present in avutil any longer either.
Signed-off-by: Martin Storsjö <martin@martin.st>

These tables are used for instance by older versions of libavcodec and
need to remain visible until the next SONAME bump.
Signed-off-by: Martin Storsjö <martin@martin.st>

This removes inline av_log2 and av_log2_16bit from the public API,
instead exporting them as regular functions.  In-tree code still
gets the inline and otherwise optimised variants.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This name is more descriptive as the function returns a fixed-point
value with 15 fraction bits.
Signed-off-by: Mans Rullgard <mans@mansr.com>

* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9ef4321':
  fate-vc1: add dependencies
  ARM: fix overreads in neon h264 chroma mc
  rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
  gitignore: ignore files created by msvc
  fate: Add proper dependencies for the tests in video.mak
  configure: Disable Snow decoder and encoder by default
  lzo: Drop obsolete fast_memcpy reference
  build: Drop OBJS declaration for non-existing PCM_DVD encoder
  mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all

Conflicts:
	libavcodec/mpegvideo.c
	libavformat/rtsp.c
	tests/fate/microsoft.mak
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Avoid to divide num and den by gcd in case of a parsed expression, since
that is already done in av_d2q(), and force reduction in case of "a:b"
form, allowing to honour the max parameter.

The latter change is consistent with the a/b case, and with the
documentation.