* commit 'f776899a':
  bitstream: K&R formatting cosmetics

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

* commit '9e80eda2':
  h264_mp4toannexb_bsf: return a padded buffer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8d929afd':
  h264_mp4toannexb_bsf: factor out extradata parsing

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

* commit '5d21ca45':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

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

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

Otherwise, cover art will create video stream with index 0.
Fixes #2677.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

This prevents additional integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The description if for the function, not the group.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320
Signed-off-by: James Almer <jamrial@gmail.com>

Also increase the buffer size in write_trailer(), since 128
is not enough anymore
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

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

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

The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Such broken llrint() exist for example on netbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Mostly a copy&paste from other hash functions, with changes
where required.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also don't write empty tags.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Regression introduced by 799f57acSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The filter was ported to a native libavfilter filter.

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>