* commit 'ceec6e79':
  avi: directly resync on DV in AVI read failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '756547ce':
  avi: DV in AVI must be considered single stream

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

* commit '1cac9acc':
  avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1018a922':
  jpeg2000: Check block length

See: 914ab4cd
See: 582f5334Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '071e29af':
  vmnc: Use meaningful return values
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5e992a46':
  vmnc: Check the cursor dimensions

Conflicts:
	libavcodec/vmnc.c

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

* commit '61cd19b8':
  vmnc: Port to bytestream2

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

* commit 'a66aa0da':
  vmnc: K&R formatting cosmetics

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

CC: libav-stable@libav.org

This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.

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

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

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

And manage the reallocation failure path.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Fix some buffer overreads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

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

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

This may fix compilation with libxv 1.0.4.

no testcase available, just found this issue by reading the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* qatar/master:
  x86inc: Remove .rodata kludges

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

* commit '9e3946aa':
  build: Require yasm 0.8.0 or higher

Conflicts:
	configure

If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The Mach-O bug was fixed in yasm 0.8.0 and we don't
support versions that old anymore.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is in preparation for removing a .rodata kludge
which was only required for older YASM versions.

The movbe instruction was introduced in 0.8.0, which already
had AVX, which was introduced in 0.7.0, and NASM introduced
movbe in 2.0.3, which is the same version which introduced
AVX support.

Also, make the failure message more accurate.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* qatar/master:
  shorten: Extend fixed_coeffs to properly support pred_order 0

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

Fixes an error when running make checkheaders.

Add Twitter with myself (Lou Logan) as maintainer.

Add Google+ with Paul B Mahol, Michael Niedermayer, and Alexander
Strasser as maintainers.

Move website and mailinglists from Miscellaneous Areas to
Communication.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

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

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This make name of the file more specific
as there is also encoder implementation.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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