mem: Improve documentation wording and spelling
mem: Do not check unsigned values for negative size
mpeg12enc: drop forward declarations

Signed-off-by: Diego Biurrun <diego@biurrun.de>
mpeg12enc: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avcodec: Stop exporting the removed audio_resample* symbols
avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
avisynth: K&R formatting cosmetics
Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
  mem: Improve documentation wording and spelling

Conflicts:
	libavutil/mem.c
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'

* commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b':
  mem: Do not check unsigned values for negative size

Conflicts:
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'

* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
  mpeg12enc: drop forward declarations

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29'

* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
  mpeg12enc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'

* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
	libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'

* commit '97b052e56807fab6887e9ba210a28a622e6a4b78':
  avisynth: Add missing #include for NULL_IF_CONFIG_SMALL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avisynth: K&R formatting cosmetics

Conflicts:
	libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi: Weston 3 Field Deinterlacing Filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
pixfmt: add native GBRAP16 format

Signed-off-by: Paul B Mahol <onemda@gmail.com>
avcodec/xan: use uint8_t instead of unsigned char

Signed-off-by: Paul B Mahol <onemda@gmail.com>
s302m: s/bits_per_coded_sample/bits_per_raw_sample

bits_per_coded_sample should be set from demuxer and
not from decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavfi/fieldorder: remove redundant get_video_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavfi/fieldorder: use av_image_fill_linesizes()

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