Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

* commit '67690683130faf37dd9d969ced15eba2a1940ade':
  g722: Split out g722_qmf_apply() function into g722dsp.c

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

avformat/mov: Bypass av_add_index_entry()

The new mov code uses a temporally non sorted index since 4abfa387b8234736f6e0e541951e3d5eb60eb843
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387b8234736f6e0e541951e3d5eb60eb843 and this commit would be
a alternative fix as would be various other options.

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

Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'

* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
  mov: Change DTS-based seek into CTS-based seek.

Conflicts:
libavformat/mov.c

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

Merge commit '51ca3cb604a7585a7cff35d4b954794508955c19'

* commit '51ca3cb604a7585a7cff35d4b954794508955c19':
  xcbgrab: Use the correct geometry for the region highlight

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

g722: Split out g722_qmf_apply() function into g722dsp.c

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>

Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

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

Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
libavformat/oggenc.c

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

Merge commit '53367b34e1156614e82ef7af888928f322566f88'

* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
libavformat/rtpdec_h264.c

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

Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'

* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

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

Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'

* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

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

Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'

* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

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

Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'

* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
  rtp: h264: Move profile_level_id parsing to a function

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

Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
libavdevice/xcbgrab.c

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

Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'

* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
  xcbgrab: Check for xcb-shape

Conflicts:
configure

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

mov: Change DTS-based seek into CTS-based seek.

CTS-based seek is reasonable since player requests frames in output order
not coded order.

This change fixes seek to a keyframe within consecutive keyframes.
Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS
respectively, and both two frames are a keyframe. If you try to seek on
PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This
is obviously undesirable.

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148'

* commit 'e21d85309943a51b7808f5e01dd258b262e09148':
  FATE: add a test for the SVQ1 header byte swapping

Conflicts:
tests/fate/qt.mak

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

Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'

* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
  changelog: mention DXVA/HEVC and AAC ELD480

Conflicts:
Changelog

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

avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"

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

avformat/rtpdec: DV depacketizer (RFC 6469)

Tested with live555 RTSP server

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

ffserver: fix wrong indentation

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: decouple assignment and check

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: break too-long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: reorder HTTP fwd decls

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

xcbgrab: Use the correct geometry for the region highlight

The feature is implemented using a transparent window and drawing
inside it a rectangle filling the whole window to highlight it.

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

ape: Use the proper variable type

Avoid an unsigned underflow.

Bug-Id: 1041122
CC: libav-stable@libav.org

ogg: check memory allocations

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

rtp: h264: Drop the asserts

rtp: h264: Move FU-A NAL parsing to a function

rtp: h264: Move STAP-A NAL parsing to a function

rtp: h264: Move parse_sprop_parameter_sets parsing to a function

rtp: h264: Move profile_level_id parsing to a function

xcbgrab: Correctly make shm optional

The segment field in the struct has to be conditionally build
as well.

xcbgrab: Check for xcb-shape

It is required.

x86/swr: make pack_8ch functions work with compilers without aligned stack

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

avcodec/vc1: cleanup and simplification

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

FATE: add a test for the SVQ1 header byte swapping

changelog: mention DXVA/HEVC and AAC ELD480

rtpdec: experimental VP9 depacketizer (draft 0)

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

ffmpeg_opt: Creating new data stream for output format context

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
if input codec Id match with expected data stream of output format context
then only new stream with same codec id is created.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dcadec: Move remaining tables to dcadata.h

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

avfilter/vsrc_mandelbrot: fix indention of mis-indented block

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

avcodec/h264: use avpriv_find_start_code() in h264_split()

This also allows replacing several literal numbers by named constants
And it should be faster, the function is not speed relevant though as it is
generally only called a few times at the streams start.

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

avformat/matroskaenc: add allow_raw_vfw and disable it by default

Based on complaint by wm4

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

avutil/fixed_dsp: Use av_clip_int16() instead of the non optimized av_clip_int16_c()

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

Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'

* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
  vdpau: Adjust necessary #includes for vdpau_internal.h

Conflicts:
libavcodec/vdpau_internal.h

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

Merge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'

* commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f':
  mov: Fix compilation with DEBUG enabled

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

Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
  dca: Move all tables into dcadata.h

Conflicts:
libavcodec/dcadec.c

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

Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

* commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3':
  dca: Remove trace debugging code

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

Merge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'

* commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa':
  dca: Return more informative error codes

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

avcodec/dcaenc: rename DCA_SUBBANDS

Fixes "warning: DCA_SUBBANDS redefined"

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

Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'

* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
  dca: Split code for handling the EXSS extension off into a separate file

Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c

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

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
  Don't anonymously typedef structs

Conflicts:
avprobe.c
libavutil/parseutils.c

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

Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'

* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
  avcodec: Don't anonymously typedef structs

Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c

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

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  avformat: Don't anonymously typedef structs

Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c

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

avfilter: bump minor and Changelog document the new filters

avfilter: add paletteuse filter

avfilter: add palettegen filter

avcodec/gif: support crop and transparency with PAL8

avformat/gif: use first packet palette as global for PAL8

This will allow the payload in PAL8 packets to not contain 768B of local
palette (which is not LZW compressed).

avformat/gif: simplify gif_image_write_header() prototype

avcodec/dxtory: use init_get_bits8()

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

Merge commit '7769be590c7aeb2aad26ca723d105cf5203e33d2'

* commit '7769be590c7aeb2aad26ca723d105cf5203e33d2':
  vp56: Return meaningful error codes

Conflicts:
libavcodec/vp56.c

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

avformat/rtpdec_ac3: add AC3 RTP depacketization (RFC 4184)

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vdpau: Adjust necessary #includes for vdpau_internal.h

mov: Fix compilation with DEBUG enabled

avformat/rtpdec_mpeg12: add robust MPEG audio depacketization (RFC 5219)

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcocdec/mpegaudio_parser: add MP3 ADU headers parser

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dca: Move all tables into dcadata.h

dca: Remove trace debugging code

dca: Return more informative error codes

dca: Split code for handling the EXSS extension off into a separate file

Don't anonymously typedef structs

avcodec: Don't anonymously typedef structs

avformat: Don't anonymously typedef structs

vp56: Return meaningful error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86: hevc: remove a parameter to WP internals

The second stride is always the internal buffer one, MAX_PB_SIZE (times 2 to
get the value in bytes).

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

avcodec/vc1_pred: few branchless optimizations

This is also simpler

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

avcodec/parser: optimize ff_mpeg4video_split()

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

lavc: deprecate VIMA decoder

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

avformat/matroskaenc: Do not use native mode for raw RGB

This fixes generating totally unplayable files

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

avformat/matroskaenc: fix handling of VFW style raw rgb

raw rgb uses 0 as codec tag in "VFW", the code assumed 0 means error

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

avformat/mov: print a warning if parsing udta failed

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

avcodec/apedec: simplify sign conversion

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/golomb: simplify sign conversion

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/apedec: move 'coeffs[256] and delay[256]' into, long_filter_high_3800

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wmalosslessdec: simplify

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

avcodec/wmalosslessdec: optimize sign operation

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wmalosslessdec: change type of acfilter_coeffs from int64_t to int16_t

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wmv2: simplify cbp_table_index calculation

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

avcodec/vc1: simplify vc1_split()

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

avcodec/vc1: simplify find_next_marker()

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc'

* commit 'eea769df322fac2601a96db195fa7dc8d12a8fbc':
  hevc: Use generic av_clip function, not C implementation

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c

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

Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'

* commit 'faa8ffda2c513573733624784f0a7d0a4959d33e':
  doc/APIchanges: fill in missing dates and hashes

Conflicts:
doc/APIchanges

See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: add wavpack encoder

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

hevc: Use generic av_clip function, not C implementation

hevc seems to be the only place where the C implementation
of the av_clip function is explicitly selected, precluding
platform-specific optimizations

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

doc/APIchanges: fill in missing dates and hashes

Also, move a misplaced block to the right position.

avformat/mov: Heuristically detect raw udta

Fixes tkhd+moov fragment provided by koda

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

avformat/rtsp: parse lang attribute in SDP

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rtpdec: add T.140 RTP depacketization (RFC 4103)

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rtsp: allow receiving subtitles via RTP

Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>