Map --enable-lto to -ipo when compiling with icc.

Disable inline_asm_direct_symbol_refs if lto was requested.

This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.

avcodec/h263dec: use AV_EF_IGNORE_ERR

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

avformat: add AV_EF_IGNORE_ERR

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

avcodec: add AV_EF_IGNORE_ERR

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

doc/codecs: document ignore_err

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

avfilter/lut3d: support 3DLUTSIZE directive for Davinci files.

Fixes Ticket #2847.

MAINTAINERS: add myself as lavd/xv maintainer

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Maintainers: add myself for msvc and icl.

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

Enable inline asm in intel compiler on windows.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Initialize riff and wav size fields to -1 instead of 0.

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

Merge commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510'

* commit 'dcbfb7805a655757e0dac2a647dfcd3de0ab0510':
  probe: Support AAC_LATM in set_codec_from_probe_data

Conflicts:
libavformat/utils.c

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

Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f'

* commit 'de69aedf9935631b7f78e8b8da6e460422a9bc5f':
  mathematics: K&R formatting cosmetics

Conflicts:
libavutil/mathematics.c

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

Merge commit '3a177a9cca924e097265b32f9282814f6b653e08'

* commit '3a177a9cca924e097265b32f9282814f6b653e08':
  swscale: Fix an undefined behaviour

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

Merge commit '925c37874b617816b6f460c6f229c18b46548b46'

* commit '925c37874b617816b6f460c6f229c18b46548b46':
  vp9: Read the frame size as unsigned

Conflicts:
libavcodec/vp9.c

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

Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

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

Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flvdec.c

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

avcodec/jpeglsdec: add cast to silence pointer type warning

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

avfilter/vf_deshake: dont pass the wrong context into the SAD functions

This fixes pointer type warnings
The context should have been unused so this should not fix any real bug

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

avcodec/snow_dwt: fix "incompatible pointer type" warnings

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

Initialize riff and wav size fields to -1 instead of 0.

WMP doess not play the output files if the fields are
set to 0 and not overwritten (using pipe output).

Fixes ticket #3346.

avcodec/kgv1dec: add casts to silence "assignment from incompatible pointer type"

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

avcodec/xbmdec: fix pointer type warnings

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

avcodec/h263dec: fix "incompatible pointer type" warning

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

avfilter/audio: use av_mallocz_array()

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

avcdoec/snowenc: use av_mallocz_array()

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

avcodec/ffv1dec: use av_malloc_array()

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

avfilter/edgedetect: update copyright.

avfilter/edgedetect: reindent after previous commit.

avfilter/edgedetect: add a colormix mode.

probe: Support AAC_LATM in set_codec_from_probe_data

latm: Add a probe function

mathematics: K&R formatting cosmetics

swscale: Fix an undefined behaviour

Prevent a division by zero down the codepath.

Sample-Id: 00001721-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

vp9: Read the frame size as unsigned

Sample-Id: 00001723-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avfilter/edgedetect: make processing functions context free.

x86/cavdsp: prevent named constraints appearing twice.

Remove two duplicated named asm constraints.

This fixes compilation of libmpcodecs/vf_fspp.c with gcc and
INLINE_ASM_DIRECT_SYMBOL_REFS disabled.

vfilter/vf_yadif: fix request_frame after 0f9f24c9

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

avcodec/h264: mark recovery_cnt==0 frames as keyframes

Fixes Ticket3063

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

Fix standalone compilation of dsd planar decoders.

Fix oga muxer standalone compilation.

avfilter/vf_showinfo: also calculate and show mean and standard deviation

Fixes Ticket3013

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

doc/APIchanges: more dates and hashes

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

doc/APIchanges: add hashes and dates

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41)

Authors from svn:
cehoyos (2):
      Support playback of JPEG 2000 digital cinema files.
      Add name for image format IMGFMT_440P.

ib (1):
      Get rid of VOCTRL_GUI_NOWINDOW.

Matt Oliver (4):
      Fix libmpcodecs inline asm on ICL.
      Use DECLARE_ALIGNED helper macros.
      Remove some superfluous commas from inline asm for better compatibility.
      Use numeric labels in inline asm for consistency and better     compatibility.

reimar (10):
      Fix bpp calculation for XYZ format.
      Avoid duplicating the mouse autohide code.
      Add NV12/NV21 support to some helper functions.
      Add support for rotating the video via OpenGL.
      Add options to determine where borders will be added when adjusting for aspect.
      Apply forgotten move of apply_border_pos function.
      Extract window creation code to common file.
      Make VDPAU support work again with latest FFmpeg.
      img_format: document why mp_get_chroma_shift does not work for NV12/NV21
      Minor spelling/grammar fixes.

For detailed line by line authorship please see svn log of mplayer
svn://svn.mplayerhq.hu/mplayer/trunk

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

doc: fix message names in opengl doc

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h263dec: print MB position for each MB when TRACE is enabled

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

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: reident after previous commits
  lavf/mux: pass options to nested structs of priv data
  lavu/opt: add av_opt_set_dict2() function
  lavd/opengl_enc: fix window size correction code
  lavd/opengl_enc: add window size param
  lavd/opengl_enc: use flag to mark inited context

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

lavd/xv: reident after previous commits

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavf/mux: pass options to nested structs of priv data

This commit allows to benefit from implementing child_next
callback for muxers' AVClasses.
Without that, options cannot be set in nested structs.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavu/opt: add av_opt_set_dict2() function

Existing av_opt_set_dict doesn't accept flags.
It doesn't allow to pass options to nested structs.
New function alllows that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/opengl_enc: fix window size correction code

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/opengl_enc: add window size param

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/opengl_enc: use flag to mark inited context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

avcodec/mpegvideo: fix gray*() parameter types

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

avcodec/mpegvideo: support disabling motion compensation

This allows analyzing videos without having prior and current frames mixed

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

Enable opencl wihtout pthreads.

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

avfilter/vf_yadif: fix filtering a single image

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

avcodec/libxvid: improve return codes

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

avcodec/utils/ff_init_buffer_info factor avctx->internal->pkt; out

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

avcodec/utils: merge ff_decode_frame_props() and ff_init_buffer_info()

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

avcodec/utils: ff_decode_frame_props: set pkt_size

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

ffmpeg: put the sizeof() second in av_malloc_array()

This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

opencl: add support for non-pthread locking

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

avformat/wtvdec: ignore mpeg2 extradata

Files produced by windows media center contain meaningless mpeg1 sequence
header. The mpeg2 decoder detects the presence mpeg1 sequence header start
codes and attempts to decode the stream as mpeg1. (This problem introduced
in 73a2d16b.)

Fixes ticket #3601.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

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

Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'

* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
libavcodec/utils.c

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

Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'

* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
  rmdec: do not export anything to AVCodecContext.codec_name

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

Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

* commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d':
  asfenc: use codec descriptors instead of AVCodecs to write codec info

Conflicts:
tests/ref/lavf/asf
tests/ref/seek/lavf-asf

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

Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'

* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0':
  oggparseskeleton: do not use AVCodecContext.codec_name

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

Merge commit '18f2514c4037befd37b02e4d4f10c159edf3b26f'

* commit '18f2514c4037befd37b02e4d4f10c159edf3b26f':
  mov: export stsd Compressorname in metadata

Conflicts:
libavformat/mov.c

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

Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
libavcodec/version.h

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

Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
libavcodec/libxvid.c
libavcodec/version.h

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

Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:
libavcodec/version.h

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

Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'

* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
doc/APIchanges

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

avformat/vobsub: use av_make_q().

avformat/vobsub: remove pointless FAIL macro.

Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

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

Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'

* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1':
  matroskaenc: write CodecDelay

Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74

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

Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'

* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h

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

aac: K&R formatting cosmetics

flv: K&R formatting cosmetics

lavfi/subtitles: introduce stream_index

Signed-off-by: ValdikSS <iam@valdikss.org.ru>

lavc: deprecate AVCodecContext.codec_name

It is undocumented and has no real use.

lavc: do not use AVCodecContext.codec_name in avcodec_string()

That field will be deprecated.

rmdec: do not export anything to AVCodecContext.codec_name

That field will be deprecated and the value that is written there is not
particularly useful.

asfenc: use codec descriptors instead of AVCodecs to write codec info

Also, stop using AVCodecContext.codec_name as fallback, since it will be
deprecated.

Changes the result of the lavf-asf test (and its associated seektest),
since 'msmpeg4v3' gets written instead of just 'msmpeg4'.

oggparseskeleton: do not use AVCodecContext.codec_name

That field is undocumented, of dubious use, and will be deprecated.

mov: export stsd Compressorname in metadata

Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.

lavc: move CODEC_FLAG_MV0 to mpegvideo

lavc: make the xvid-specific "gmc" flag a private option of libxvid

lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

The addition of reference-counted frames makes it pointless.

matroska: add the Opus mapping

matroskaenc: write CodecDelay

lavfi: add Bauer stereo-to-binaural audio filter

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

avformat/avidec: set average frame rate from header

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

Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'

* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
  matroskadec: read the CodecDelay element

Conflicts:
libavformat/matroska.h
libavformat/matroskadec.c

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