Merge commit '4a0f6651434c6f213d830140f575b4ec7858519f'

* commit '4a0f6651434c6f213d830140f575b4ec7858519f':
  libavcodec: when decoding, copy replaygain side data to decoded frames

Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c

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

Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
  Add replaygain side data type and code for parsing replaygain tags.

Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

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

Merge commit '25b32586566f285d797737863c97a1c5c9c84e2b'

* commit '25b32586566f285d797737863c97a1c5c9c84e2b':
  lavf: add an AVStream field for exporting stream-global side data

Conflicts:
libavformat/utils.c
libavformat/version.h

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

Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
doc/APIchanges
libavcodec/version.h

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Remove dcbzl check for e500v1 and e500v2 architectures

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

libavcodec: when decoding, copy replaygain side data to decoded frames

Add replaygain side data type and code for parsing replaygain tags.

lavf: add an AVStream field for exporting stream-global side data

lavc: give a typedeffed name to the AVPacket.side_data struct

Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'

* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpeg.c

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

swscale/swscale: fix integer overflow

Should fix fate failure with clang ftrapv

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

fate: add tests for linearly interpolated resampling

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

tests/tiny_psnr: Print information about the supported sample types in the help and error texts

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

swresample/resample: sse float linear interpolation

About two times faster

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

swresample/resample: mmx2/sse2 int16 linear interpolation

About three times faster

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

configure: Remove dcbzl check for e500v1 and e500v2 architectures

The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we
need to explicitly disable it for these architectures.

References: PowerPC™ e500 Core Family Reference Manual (Freescale)

Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

mpeg: K&R formatting cosmetics

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Split h264 slice decoding from nal decoding

Conflicts:
libavcodec/Makefile
libavcodec/h264.c

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

Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'

* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0':
  h264: move macroblock decoding into its own file

Conflicts:
libavcodec/Makefile
libavcodec/h264.c

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

Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'

* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
  build: Sort h264 objects

Conflicts:
libavcodec/Makefile

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

Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'

* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
configure

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavu: add myself as dynarray.h maintainer.
  ffmpeg: sub2video: send a last blank frame before closing.
  tools: add dvd2concat.
  lavf/concatdec: allow to match streams by id.

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

h264: Split h264 slice decoding from nal decoding

h264: move macroblock decoding into its own file

build: Sort h264 objects

build: h264 parser depends on full h264 decoder

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  RELEASE_NOTES: mention new filters

Conflicts:
doc/RELEASE_NOTES

Not merged as these things where in past ffmpeg releases already.
Or at least some of them where, volunteers to checks this and update
our release notes are welcome

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

lavu: add myself as dynarray.h maintainer.

ffmpeg: sub2video: send a last blank frame before closing.

Fix trac ticket #3420.

tools: add dvd2concat.

lavf/concatdec: allow to match streams by id.

That makes the concat demuxer usable with MPEG-PS streams,
even when the streams in the different parts are detected
in different order.

Always pass the configure option sysroot to --sysroot and -isysroot.

On darwin, --sysroot may be ignored.

Autodetect VDA like all other hardware acccelerations.

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

RELEASE_NOTES: mention new filters

avcodec/x86/h264_qpel: Fix typo introduced by 322a1dda973e802db7b57f2007fad3efcd5bab81

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

Move avpriv_find_pix_fmt() to utils.c

Fixes build with --disable-everything

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

http: restructure http_connect error handling path

The authstr memory allocations make it annoying to error in the middle
of the header setup code, so apply the usual C error handling idiom to
make it easier to error at any point.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: drop ff_pixfmt_list_420

Conflicts:
libavcodec/flvdec.c
libavcodec/msmpeg4dec.c
libavcodec/rv10.c

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

Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'

* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
  changelog: switch libx265 and compand entries

Conflicts:
Changelog

Not many changes as libx265 and compand are placed correctly for us

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

Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'

* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
configure

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

Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'

* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
libavformat/movenc.c

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

lavc: drop ff_pixfmt_list_420

changelog: switch libx265 and compand entries

configure: Always use -DOPJ_STATIC when checking for openjpeg

Unbreaks windows systems not providing pkgconf files.

Reported-By: Rafaël Carré <funman@videolan.org>

movenc: Allow override of major brand in ftyp atom

Signed-off-by: Tim Walker <tdskywalker@gmail.com>

avcodec: Add padding after the remaining AVFrames

This limits ABI issues in case libavcodec is linked to a libavutil with larger AVFrame
Which can happen if they are shiped in seperate binary packages and libavutil is upgraded

A cleaner alternative would be to replace them by pointers but this would likely cause
a small speedloss

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  mpegts: fix teletext pts of streams with standalone pcr pid
  mpegts: add pcr filter for tracking standalone pcr pids
  mpegts: factorize mpegts filter creator code
  mpegts: move last_pcr to MpegTSFilter level

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lagarith: Fix typo in printf format string

Conflicts:
libavcodec/lagarith.c

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

Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'

* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
  dsputil: Move thirdpel-related bits into their own context

Conflicts:
libavcodec/svq3.c

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

Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:
libavcodec/x86/dsputil_x86.h

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

Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'

* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
  ppc: dsputil: Move hpeldsp-related declarations to a separate header

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

Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

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

Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h

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

Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
libavcodec/imgconvert.c

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

Merge commit '600b854ad8173995518bd917e7f86120b5505088'

* commit '600b854ad8173995518bd917e7f86120b5505088':
  imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h

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

Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
  x86: dsputil: Move inline assembly macros to a separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'

* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
  nuv: Reuse the DSPContext from RTJpegContext

Conflicts:
libavcodec/nuv.c

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

avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD

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

avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()

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

lavu/mem: reimplement the dynarray functions with the macro.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu: add AV_DYNARRAY_ADD() macro.

Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: Replace arch optimization ifdefs by if cascade

Conflicts:
libavutil/float_dsp.c

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

Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'

* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
  avcodec: more correct printf specifiers

Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c

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

lagarith: Fix typo in printf format string

libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]

Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c

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

fate: add cine demux test

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

avcodec/snowenc: make snow non experimental

After this commit the created bitstream will be supported by future
decoders.

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

udp: try to clarify verbiage on buffer_size

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough

which can happen easily in linux

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dsputil: Move thirdpel-related bits into their own context

x86: dsputil: Move hpeldsp-related declarations to a separate header

ppc: dsputil: Move hpeldsp-related declarations to a separate header

x86: dsputil: Move fpel declarations to a separate header

dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil

x86: dsputil: Move inline assembly macros to a separate header

nuv: Reuse the DSPContext from RTJpegContext

There is no point in populating NuvContext with another DSPContext.

Also split static and dynamic initialization bits to avoid running the
static initialization parts over and over.

float_dsp: Replace arch optimization ifdefs by if cascade

Arch-specific optimizations are handled this way everywhere else.

avcodec: more correct printf specifiers

Additional icl inline asm fix.

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

mpegts: fix teletext pts of streams with standalone pcr pid

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: add pcr filter for tracking standalone pcr pids

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: factorize mpegts filter creator code

Signed-off-by: Marton Balint <cus@passwd.hu>

mpegts: move last_pcr to MpegTSFilter level

Signed-off-by: Marton Balint <cus@passwd.hu>

avfilter: more correct printf format specifiers

lavc/libx264: add a warning when using qscale

This addresses ticket #3238.

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

dshow: use distinct buffers per stream.

Basically sometimes if you start dropping video packets, you also drop audio packets. Now they each have separate buffers to avoid this unexpected behavior.

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

elbg: change utility_inc to 64bit

Fixes integer overflow
Fixes Ticket3462

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

avformat/mp3enc: use av_copy_packet()

Fixes double free
Fixes Ticket3476

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

avcodec/snowdec: also print qbias and mvscale in debug output

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

avcodec/snowdec: forward error codes

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

avcodec/snowdec: return more specific error codes

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

avcodec/snowenc: simplify spatial_decomposition_count seting code

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

http: never send 'Cookie: (null)' to the server

If a domain has some cookies set, but matching the cookie fails due to
the port being different, get_cookies() succeeds, but sets cookies to
NULL. The caller of get_cookies() didn't check for the NULL value.

This also avoids passing NULL to libc string functions, which is
undefined behavior

Fixes Ticket2180

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

avcodec/snowenc: allow larger mb variances

Fixes assertion failure
Fixes Ticket3463

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

avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit

This avoids hypothetical integer overflows

avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit

This avoids a hypothetical integer overflow with very high resolution video

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

avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit

This avoids a hypothetical integer overflow with very high resolution video

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

configure: Try to fix detection of ARM Compiler 5.04

Fixes Ticket 3364

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