* qatar/master:
  smacker: check frame size validity

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

* commit '58c95448':
  smacker: pad the extradata allocation

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

* commit 'bbb2945f':
  smacker: check the return value of smacker_decode_tree

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

* commit 'f52edef3':
  smacker: fix an off by one in huff.length computation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '985f34b7':
  utils: fix avcodec_flush_buffers pre-reference counting compatibility

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

* commit 'df9f22d4':
  avf: move url utility functions in a separate file

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

* commit '12db891d':
  avf: move ff_write_chained to mux.c

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

* commit '508998f7':
  avf: move riff tags accessors where they belong

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

* commit 'ec7c51c7':
  avf: move ff_http_match_no_proxy to network

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

* commit 'afc86853':
  avf: split off format register and lookup function

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

* commit 'f80b60ad':
  bitstream: forward error values and drop few abort()

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

* 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>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Also prevent a memory leak.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

The to_free AVframe must be freed just like the other ones.
Indeed, the calling application may expect all frames to be
released.

(This regression caused use-after-free in VLC with hwaccel.)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

It is only used by network protocols.

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>