gitignore: add tools/uncoded_frame

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

avcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc()

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

avcodec/mpeg4videodec: fix mcbpc error messages

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

avcodec/snowenc: Fix "incompatible pointer type" warning

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

avfilter/af_bs2b: Fix incompatible pointer type warnings

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

avcodec/svq3: Fix "incompatible pointer type" warnings

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

avformat/segment: Use av_malloc_array()

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

avutil/file_open: Use av_mallocz_array()

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

tests/tiny_ssim: more correct error message

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

avutil/audio_fifo: Use av_mallocz_array()

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

tools/ismindex: use av_mallocz_array()

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

tests/tiny_ssim: check dimensions

Fix integer overflow

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

lavu/fifo: add const to arguments

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

avformat/astenc: avoid using AVCodecContext.frame_number

Theres no gurantee that the user application has initialized it

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

Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'

* commit '3828eb8519c1530392ab8820b1aa784602128afc':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'

* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28ba271fb9dde54cb26e7ae93ada2997df, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9580818c5d934bde65a95efd2cee61c174721092'

* commit '9580818c5d934bde65a95efd2cee61c174721092':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

Conflicts:
ffmpeg.c
ffmpeg.h

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

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

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

Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
ffmpeg.c

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

Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
ffmpeg.c

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

Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'

* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
  avconv: rename InputStream.opts to InputStream.decoder_opts

Conflicts:
ffmpeg.c

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

Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'

* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
  avconv: simplify exit_program() by using more local vars

Conflicts:
ffmpeg.c

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

libfdk-aac: Relicense the library wrappers to 2-clause BSD

This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).

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

libfdk-aacenc: Enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.

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

Fix standalone compilation of sonic lossless encoder.

avfilter/f_select: fix incompatible pointer type warning

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

avcodec/lossless_videodsp: fix incompatible pointer type warning

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

avisynth: set duration of audio streams

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

swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array()

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

avutil/pca: Use av_malloc_array()

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

MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Map --enable-lto to -ipo when compiling with icc.
  Disable inline_asm_direct_symbol_refs if lto was requested.

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

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.

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

This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.

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

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>

avconv: rename OutputStream.opts to OutputStream.encoder_opts

This makes it more clear what is this variable for exactly.

avconv: remove a useless line

Doing anything with that field when we are doing streamcopy (so the
encoder is not opened) should have absolutely no effect.

avconv: rename 'codec' to 'enc_ctx'

This more clearly describes what is the variable used for.

Also, move its declaration into the block where it is actually used.

avconv: rename 'icodec' to 'dec_ctx'

This more clearly describes what is the variable used for.

avconv: rename InputStream.opts to InputStream.decoder_opts

This makes it more clear what is this variable for exactly.

avconv: simplify exit_program() by using more local vars

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>