* commit '3c18a7b1':
  avio: Do not consider the end-of-buffer position valid

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

* commit '6a808f5a':
  libdc1394: Add support for MONO8 (gray) video mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Check of channels !=0 is right above.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Fixes crash with odd widths
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Trigger a refill if the seek action moves the pointer
at the end of the buffer.

Before this patch the read action following the seek would trigger
the refill, while write action would write outside the buffer.

In the Libav codebase few muxers seek forward outside of what
already has been written so it is quite unlikely to experience
the problem with the default buffer size.

CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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

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

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

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

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

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

This avoids a potential conflict with the equally named function from XOPEN
It also could reduce confusion in debugger backtraces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids a potential conflict with the equally named function for closing files
It also could reduce confusion in debugger backtraces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket4256

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

This is also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It seems more logical and works with more restricted C compilers
like tinycc.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Quite a few programs missed that detail of the spec
(including old versions of FFmpeg I believe) and when
we would otherwise fail anyway it seems worth a try
to use a simple byte-aligned stride instead.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

* commit '8805589b':
  libopencv: Rework error handling in parse_iplconvkernel()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '607ad990':
  dvbsubdec: check memory allocations and propagate errors

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

* commit 'e71149a7':
  nuv: validate image size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7c51d79c':
  nsvdec: validate channels and samplerate

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

* commit 'a536a4e4':
  lavc: support extracting audio service type from side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '32125781':
  mov: export audio service type as side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4227e4fe':
  lavf: add a convenience function for adding side data to a stream

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

* commit '728685f3':
  Add a side data type for audio service type.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/frame.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '80a11de7':
  nutenc: do not use has_b_frames

Conflicts:
	libavformat/nutenc.c
	tests/ref/lavf/nut
	tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e44b5892':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

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

If this causes problems then the stream_codec_tag should be enabled again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix 'values' memory leak in case of error.

CC: libav-stable@libav.org
Bug-Id: CID 739879

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717750

Avoid a division by zero.

CC: libav-stable@libav.org
Bug-Id: CID 717749

* commit 'f771b3ab':
  avidec: do not export stream_codec_tag

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