Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'

* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
  doc: mention option to mix shared/static libraries

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

Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'

* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
  rtpdec: pass an AVFormatContext to ff_parse_fmtp()

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

Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
libavformat/yuv4mpegenc.c

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

Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'

* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
  nsvdec: remove commented out cruft

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

Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'

* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
  mov: free the dv demux context with avformat_free_context()

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

Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
  mtv: do not set sample_rate for video

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

Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
libavformat/oggparsecelt.c

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

Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
  adxdec: get rid of an avpriv function

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

Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'

* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c

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

ffmpeg: remove common factors from copied timebase

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

Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
ffmpeg.c

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

Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'

* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

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

Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

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

avcodec/roqvideoenc: Print the correct max resolution

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dvdsubenc: Add dvdsub workaround for some players

The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

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

avcodec/pthread_frame: fix setting hwaccel with threads and get_format()

Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

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

avutil/bprint:ædd io.h, try to fix msvc build

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

avformat/m4vdec: raise threshold slightly for detection

Fixes Ticket3746

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

avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained

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

doc: mention option to mix shared/static libraries

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

rtpdec: pass an AVFormatContext to ff_parse_fmtp()

Use it for logging, instead of NULL or the stream codec context.

yuv4mpegenc: do not access AVCodecContext.coded_frame

Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).

Use AVCodecContext.field_order instead.

nsvdec: remove commented out cruft

mov: free the dv demux context with avformat_free_context()

mtv: do not set sample_rate for video

oggparsecelt: do not set AVCodecContext.frame_size

It is supposed to be set by decoders only.

adxdec: get rid of an avpriv function

The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.

lavc: export DV profile API used by muxer/demuxer as public

avconv: set the output stream timebase

This is required by the new API.

avformat: update muxing doxy

The callers should now set the stream timebase, not the codec one.

cdg: set the keyframe flag on the first packet

Bug-Id: 55

Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.

Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.

avcodec/mpegvideo: flip motion vector visualization for backward motion vectors

Also support changing arrow head/tail shape

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

avdevice/pulse_audio_dec: reimplement using the non simple API

This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: respect color_range when encoding dnxhd.

Set the ACLR atom appropriately for legal / full range.

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

avformat/segment: remove gettimeofday() use, remove sys/time.h

It causes portability issues, and would need ifdef hell if its kept

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

alpha/idctdsp: move idct init code out of dsputil

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

avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).

Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
libavformat/mov.c

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

Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'

* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbdac64c57b12910521af1379a24d01f73
See: 99b01e458c268cf18ac0981e644e0f835957498a
See: 825ec16da955fd9c726d8e6c846cf9257a781a87
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/lavfi: add io.h, should fix msvc build

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

avcodec/alpha/dsputil_alpha: fix build

Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

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

mov: Remove a variable that is set but never used

This silences a warning with gcc.

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

avplay: Handle pixel aspect ratio properly

This was broken (left half-implemented) in 354468fc12.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

nut: Use nut->version in the version range check

It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)

avcodec/proresenc_anatoliy: check against maximum dimensions

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

avcodec/roqvideoenc: check dimensions against maximum

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

avcodec/roqvideoenc: fix infinite lambda increasing loop

The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

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

avformat/nutdec: if all else fails try to lookup video tag in isom

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

avformat/movenc: check that the video resolution is supported

Resolutions are stored as 16bit integers

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

Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'

* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

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

Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'

* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
libavformat/utils.c

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

Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

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

arm: Avoid using the 'setend' instruction on ARMv7 and newer

This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avformat_new_stream: make the AVCodec parameter const

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

af_compand: make sure request_frame always outputs at least one frame

This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

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

Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'

* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c

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

avcodec/crystalhd: Add #if HAVE_UNISTD_H around  #include <unistd.h>

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

avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>

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

avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around  #include <unistd.h>

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

avdevice/oss_audio: Add #if HAVE_UNISTD_H around  #include <unistd.h>

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

doc: add doxygen target tag

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: make doxygen program configurable

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: add doxy-wrapper.sh to doc/doxygen/html dependencies

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffserver: add HAVE_UNISTD_H around #include <unistd.h>

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

tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

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

avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>

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

protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches

Should fix build failure on MSVC

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

swresample: misc. doxy improvements

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/Doxyfile: use 5 columns for alphabetical index

This reverts a hunk from 671005558a295945f5d4cfd1abca6832af479c0b
Reduces diff to what we use on the server
Suggested-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'

* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
libavcodec/version.h

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

Merge commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc'

* commit 'a863c97e99bf30a88baa74f83bab9e3ab25984dc':
  smoothstreamingenc: Fix a memory leak on errors

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

avcodec/vmdvideo: remove unneeded include

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

avformat/segment: simplify localtime* use

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

avformat/segment: Support cutting at clocktime

Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dsputil: Split off FDCT bits into their own context

avdevice/lavfi: allow non-mmappable files for graph_file

Use av_bprint_fd_contents() instead of av_file_map()

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

avutil/bprint: Add av_bprint_fd_contents()

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

libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>

smoothstreamingenc: Fix a memory leak on errors

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

Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503'

* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
libavcodec/vmdvideo.c

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

vmd: Split audio and video decoder

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

avcodec/cljrdec: remove unneeded include

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

Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'

* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

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

Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d'

* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

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

Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94'

* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputilenc_mmx.c

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

avcodec/mpegvideo_enc: fix b frame strategy 2

Fixes Ticket3757

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

transcoding: fix Doxygen file path

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegvideo: small indent fix in vismv code

avcodec: make vismv option as flag types

This allows for example -vismv pf+bf+bb instead of -vismv 7.

avcodec/roqvideodec: set JPEG output color range

Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'

* commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6':
  audio_fifo: Split into a separate doxygen module

Conflicts:
libavutil/audio_fifo.h

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

Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
libavutil/samplefmt.h

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

Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192'

* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
libavcodec/Makefile
libavcodec/dsicinvideo.c

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

dsputil: Move draw_edges() to mpegvideoencdsp

Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58'

* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
libavcodec/bmvvideo.c

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

avcodec/roqvideo: use JPEG color range

Signed-off-by: ejlasota <ejlasota@gmail.com>
Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>