Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'

* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
  id3v2: Do not export empty APIC description

Conflicts:
libavformat/id3v2.c

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

Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'

* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
  png: Set the color range as full range

Conflicts:
libavcodec/pngdec.c

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

Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'

* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
  nut: Make sure to clean up on read_header failure

Conflicts:
libavformat/nutdec.c

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

Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'

* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
  avi: Validate sample_size

Conflicts:
libavformat/avidec.c

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

Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'

* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
  nut: Check chapter creation in decode_info_header

Conflicts:
libavformat/nutdec.c

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

Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'

* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
libavcodec/alac.c

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

Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'

* commit '295e05a762332c5edcc84c325e94457815a51b5c':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
libavcodec/apedec.c

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

avformat/wavenc: Check umid length

Fixes potential out of array read

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

avformat/wavenc: fix string length variable types

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

avcodec/ppc/h264qpel_template: Fix alignment assert

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

postproc/postprocess: Use size_t to hold strlen()s value

This should make no difference but its more correct

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

avformat/nutenc: Fix writing strings larger than 2gb

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

avutil/dict: Use size_t for appending strings

the string length is not constrained to INT_MAX

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

libavutil/mem: use size_t for the length in av_strdup()

the string length is not constrained to INT_MAX

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

swscale/x86/swscale: Fix warning about loosing significant bits in cast

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

avformat/http: Mark lower_proto as const in http_listen()

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

avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time

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

avformat/mxf: Simplify PRINT_KEY()

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

avcodec/snowenc: set dia_size for the first pass of motion estimation too

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

avformat_alloc_context: initialize raw_packet_buffer_remaining_size.

This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avcodec/snowenc: correct fullpel search pattern

No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size

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

avcodec/snowenc: Fix used reference MV in fullpel iterative ME

This very very slightly improves quality, no measurable speed change

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

avcodec/snowenc: change log level for iterative ME information to debug level

The printed stuff should be useless to the average user and its certainly
not an error.

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

avcodec/snowenc: add intra_penalty AVOption

This allows favoring intra or inter blocks by a user specified amount.

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

avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts

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

avcodec/mpeg12dec: Fix "-flags +gray"

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

id3v2: Do not export empty APIC description

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

png: Set the color range as full range

The format uses full range for the gray formats.

CC: libav-stable@libav.org

nut: Make sure to clean up on read_header failure

Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.

CC: libav-stable@libav.org

avi: Validate sample_size

And either error out or set it to 0 if it is negative.

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

cmdline: Check options array for not working flag combinations

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

ffmpeg_opt: Fix -timestamp parsing

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

avcodec/mpegvideo: Fix indention

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

avcodec/error_resilience: support grayscale

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

avcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263

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

avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY

Fixes Ticket4542

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

avdevice/v4l2: Try to fix build on netbsd/openbsd

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

lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FLAG_ERROR

Fixes ticket #4030.

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

avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set

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

lavd/v4l2: fix typo

This was introduced in cde6e328de214ffe8387641cdc1e433a2c2150f3

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

vp9: de-duplicate some functions that are identical between 10/12 bpp.

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

configure: remove loongson check inline asm and mips dependent

1.Loongson now have two series CPU supported MMI(Multi-Media Instruct).
  Loongson-3 designed multi-core have good performance in decoding.
  Loongson-2's support is comming soon.
2.Replaced loongson with loongson2 and loongson3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: replace arch loongson with arch extra list loongson

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

nut: Check chapter creation in decode_info_header

This fixes a segmentation fault when accessing the metadata.

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

alac: Reject rice_limit 0 if compression is used

If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.

Request a sample in case it is valid and it should be accepted.

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

ape: Support _0000 files with nblock smaller than 64

The decode_array_0000 assumed that 64 is the minimal block size
while it is not.

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

id3v2: do not export APIC description if empty

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

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

pngdec: set correct range

AV_PIX_FMT_GRAY8/16 are considered YUV formats, and the color_range is
not set - so the API user will have to assume limitted range. (Unless
the API user adds a special-case for the PNG decoder.)

Just export the correct range - full range.

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

swscale/x86/hscale_fast_bilinear_simd: Remove ancient out-commented debug code

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

doc/APIchanges: fill missing versions and hashes

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

vp9: add missing changelog and APIchanges entries for new VP9 profiles

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

avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4

Fix alpha position error for edge blocks of odd-dimensioned frames

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

avcodec/g2meet: Check init_get_bits8() return value

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

avcodec/g2meet: Use init_get_bits8()

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

ffprobe: Use av_packet_side_data_name() to find the side data name

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

avcodec: Add av_packet_side_data_name()

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

avcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0

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

avcodec/s3tc: fix decoding when dimensions are not a multiple of 4

Image dimensions were rounded down causing rows to wrap early if dimensions were not a multiple of 4.

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

aacsbr: break infinite loop in sbr_hf_calc_npatches

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal and uni vertical mc functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ripemd: move ripemd{256, 320} into separate functions

This allows the removal of a few branches.

Before:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:    7.052 +- 0.010

After:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:    6.865 +- 0.015

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

avcodec/x86/vp9dsp_init: Fix mix of declaration and statement

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vp9dsp: Replace assert by av_assert0()

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'rbultje/vp9-profile23-wip'

* rbultje/vp9-profile23-wip:
  libvpxdec: add 440 pixfmts.
  vp9: add profile 2/3 fate tests.
  vp9: add inter-frame profile 2/3 suport.
  vp9: add keyframe profile 2/3 support.
  vp9: parse profile 2/3 bitdepth in frame header.
  vp9: add profile 2/3 to exported profiles.
  fate: add/update reference files for 440 addition.
  swscale: add yuv440p10/12 pixfmts.
  lavc: add yuv440p10/12 formats to aligned pixfmt list.
  lavu: add yuv440p10/12 pixfmts.

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

libvpxdec: add 440 pixfmts.

vp9: add profile 2/3 fate tests.

avcodec/diracdec: Replace default_bsep[] by multiplication

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

swscale/x86/hscale_fast_bilinear_simd: Fix variable names in comments

Found-by: Nick Lewycky <nlewycky@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/img2dec: Autodetect qdraw images.
  lavc/qdrw: Also support real-world qdraw images.

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

avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()

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

lavf/img2dec: Autodetect qdraw images.

lavc/qdrw: Also support real-world qdraw images.

swresample/dither_template: Do not define macro functions to nothing

This avoids potential warnings

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

avformat/internal: always check arguments of hex_dump_debug()

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

avformat/asfdec: do not define print_guid() to nothing

This avoid potential warnings

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

avcodec/tableprint_vlc: Do not define functions to nothing

This avoids potential warnings

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

Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'

* commit 'e0010bb91fc0b067be8aefd2f77e6838537da433':
  mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Conflicts:
libavformat/mux.c

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

Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'

* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
  dump: Print AVAudioServiceType side data

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

Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
  libx265: Fix 'braces around scalar initializer' warning

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

Merge commit 'd81fb63d87692765c004c19934b49427df434a07'

* commit 'd81fb63d87692765c004c19934b49427df434a07':
  fate: Add a PICT test

Conflicts:
tests/fate/image.mak

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

vp9: add inter-frame profile 2/3 suport.

vp9: add keyframe profile 2/3 support.

vp9: parse profile 2/3 bitdepth in frame header.

vp9: add profile 2/3 to exported profiles.

fate: add/update reference files for 440 addition.

Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
tests/fate/image.mak

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

Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'

* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
  quickdraw: Support direct pixel blocks

Conflicts:
Changelog
libavcodec/version.h

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

Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'

* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
  quickdraw: Switch to greedy parsing

Conflicts:
libavcodec/qdrw.c

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

Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
  quickdraw: Convert to bytestream2

Conflicts:
libavcodec/qdrw.c

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

Merge commit '01fdfa51aca9086e04bd354fe3f103a49352c085'

* commit '01fdfa51aca9086e04bd354fe3f103a49352c085':
  xcbgrab: Accept geometries matching the screen size

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

swscale: add yuv440p10/12 pixfmts.

lavc: add yuv440p10/12 formats to aligned pixfmt list.

lavu: add yuv440p10/12 pixfmts.

diracdec: check that block length is valid

In init_planes p->xblen and p->yblen are set to:
            p->xblen = s->plane[0].xblen >> s->chroma_x_shift;
            p->yblen = s->plane[0].yblen >> s->chroma_y_shift;

These are later used as block_w and block_h arguments of
s->vdsp.emulated_edge_mc. If one of them is 0 it triggers an av_assert2
in emulated_edge_mc:
    av_assert2(start_x < end_x && block_w > 0);
    av_assert2(start_y < end_y && block_h > 0);

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dirac: use and forward error codes

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()

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

avcodec/vp8: Suppress empty body warnings

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

mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

dump: Print AVAudioServiceType side data

avutil/internal: Suppress empty body warning from emms_c()

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