avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft

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

ffplay: try to fix build failure on apple

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: use frame queue to determine last used pos
  ffplay: factorize frame queue operations

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

avformat/avienc: Dont search for startcodes in inserted empty avi frames

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

doc/filters: add geq gradient examples

Radial gradient by Víctor Paesa. Linear gradient by Paul Gentemann.

Also-by: Víctor Paesa <victorpaesa@googlemail.com>
Also-by: Paul Gentemann <beriukay@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>

Revert "avformat/rtpproto: fix strict aliasing violations with sockaddr"

It appears this breaks build with MSVC
until someone who has MSVC setup has time to investigate and
workaround/fix this, its better to revert so that build is not broken
Thats even more so as the original commit only fixed a hypothetical issue

This reverts commit e587a428d75d58e2e5a592efd7bff44e1d9294ee.

ffplay: use frame queue to determine last used pos

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

ffplay: factorize frame queue operations

Create a generic frame and a frame queue struct to handle video picture queues
and subtitle picture queues with common code. Also add the possibility to queue
AVFrames, however at the moment we only use SDL_Overlay buffers for video and
AVSubtitles for subtitles.

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

avfilter/ass: add shaping option

The documentation is mostly based on ass.h public header.

avfilter/ass: better log level mapping

avfilter/ass: make sure the log level are in available range

Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'

* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
libavcodec/dca_parser.c
libavcodec/dcadec.c

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

Merge commit '9030c58a780a02fb8256cb75cd39275eaad786d1'

* commit '9030c58a780a02fb8256cb75cd39275eaad786d1':
  configure: Disable i686 for i586 and lower CPUs

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a closing LF to Webm-manifest files.

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

tools/crypto_bench: fix build when AV_READ_TIME is unavailable

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add a closing LF to Webm-manifest files.

Fixes fate-webm-dash-manifest on AIX.

Reviewed-by: Nicolas George

sws: use av_clip() instead of av_clip_c()

avformat/flacenc: use av_clip() instead of av_clip_c()

lavf/hls: add hls_ts_option

Same as COMMITID 4f5493fe2380ad4aba67759baa7d7d4437f2e776.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/examples/transcoding: use av_packet_rescale_ts()

Simplify.

dca: K&R formatting cosmetics

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

configure: Disable i686 for i586 and lower CPUs

Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f'

* commit '2d589273dd36c5eb271a035ea0e669b64dae257f':
  configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

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

configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes

reduces noise for tserrors.ts

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

avformat/mpegtsenc: More verbose warning messages in case of missing video ES startcodes

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

avformat/network: move sockaddr_union after sockaddr_storage compatibility code

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

build: simplify libwebp check

Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.

Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'

* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
  ismindex: handle time discontinuities and nonzero start time

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

hlsenc: single_file, support HLS ver 4 byteranges

This adds a new option -hls_flags single_file that creates one .ts file
for HLS and adds byteranges to the .m3u8 file, instead of creating one
.ts file for each segment.

This is helpful at least for storing large number of videos, as the
number of files per video is drastically reduced and copying and storing
those files takes less requests and inodes.

This is based on work by Nicolas Martyanoff, discussed on ffmpeg-devel
in July 2014. That patch seems abandoned by the author, and contained
unrelated changes. This patch tries to add the minimum amount of code to
support the byterange playlists.

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

avfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft

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

avutil: remove obsolete FF_API_OLD_OPENCL cruft

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

avutil: remove obsolete FF_API_LLS1 cruft

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

ismindex: handle time discontinuities and nonzero start time

The input file may not have consistent start times, stream durations and
chunk durations. This patch at least removes negative durations that
make chromecast unhappy, and correctly sets starting time on chunks so
that the split (or .ismf) outputs match the manifest.

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

RELEASE: update to 2.4.git

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

avformat/rtpproto: fix strict aliasing violations with sockaddr

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

avformat/network: add union for avoiding strict aliassing violations with sockaddr*

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

avcodec: remove obsolete FF_API_DSPUTIL cruft

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

avcodec/tiff: fix odd dimensioned yuv

Fixes Ticket3893

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

avcodec/libvpxdec: Adds decode support for formats other than 420

Handles decoding of new VP9 profiles 1-3 with different color sampling
and bit-depths.

For high bitdepth (profiles 2 and 3) support, we currently need to link
with the highbitdepth branch of libvpx with --enable-experimental
and --enable-vp9-high config options on. But eventually this branch will
be merged into master, whereafter to enable high bitdepth
support you will need to link with libvpx with configure option
--enable-vp9-highbitdepth on.

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

avcodec/microdvddec: indent fix

avcodec/utils: remove avcodec_ prefix for internal symbol

avcodec/mjpegenc: the AMV encoder doesnt support yuv422

Fixes Ticket3883

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

Changelog: add 2.4

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

doc/examples: remove unneeded NULL checks

dst_file cannot be NULL

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

MAINTAINERS: Add 2.4 to maintained releases, drop 2.3

2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams

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

Changelog/RELEASE_NOTES: prepare for 2.4

doc/APIchanges: Update hashes and dates

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

doc/APIchanges: attempt to split releases

Based on several git show origin/release/X.Y:doc/APIchanges.

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

doc: mention important API changes in the RELEASE_NOTES

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffserver: drop custom skip_spaces() impl

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

ffserver: use correct error for stream not found

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

doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

RELEASE_NOTES: add version numbers

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

RELEASE_NOTES: Add next versions name (Fresnel)

The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly

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

avformat/utils: free s->pb for image2 as it can be used with and without a file

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

avformat/assenc: honor ReadOrder

avdevice/lavfi: dont assign variables to themselfs

Fixes "warning: explicitly assigning a variable of type int to itself"

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

Fix "passing argument 1 of av_free discards const qualifier from pointer target type"

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

avformat/mpegts: Improve probe heuristic by considering the overall frequency of 0x47 headers

Fixes Ticket3939

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

avcodec/mjpegdec: Fix chroma width rounding

Fixes vertical line at the right side
Fixes Ticket 3929

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

avcodec/bmp_parser: delay frame end detection to the next header or EOF

Fixes Ticket3687

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

avcodec/bmp_parser: simplify

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

avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header

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

avformat/vobsub: fix NULL dereference

avcodec/ac3en: use FF_ALLOC(Z)_ARRAY()

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

lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: document the addition of the AVProbeData.mime_type field and it's implications

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: Fix miscompilation for i586

If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.

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

avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.

Fixes Ticket3901

the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL

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

avformat/format: Run image2 probe again when file content data is available

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/img2dec: reduce bmppipe probe score

bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly

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

docs: add example around the suggested commit message format

It gets rendered inline in HTML and becomes not very clear.

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

configure: fix check_cmd in check_host_cpp

Use correct cpp and c flags variables for the host libc.

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8

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

avcodec/png_parser: Return the buffered data at the end

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

avcodec/pngdec: print the actual number of bytes left in the error case

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

avformat/img2_alias_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

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

avformat/img2_alias & brender_pix: fix function names

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

avformat/img2_brender_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

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

avformat/img2: Make AVOptions available to img* demuxers defined in other files

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

avformat/rmdec: very basic MLTI support

Fixes Ticket2152

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

ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Fixes Ticket3562

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

Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
doc/ffmpeg.texi

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

avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

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

doc: Fix syntax and logical errors in avconv stream combination example

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

avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

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

avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

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

avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

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

avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

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

avformat/mp3dec: Improve seeking frame sync code

Fixes Ticket3884

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

av_filter/x86/idet: use HADDD where appropriate

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

avformat: remove FF_API_ASS_SSA dead code

avcodec/snow: make new_picture const

Fixes "assignment discards const qualifier from pointer target type"

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

Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'

* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
  dv: K&R formatting cosmetics

Conflicts:
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dvdec.c
libavcodec/dvenc.c

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

Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'

* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
  x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags

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

Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'

* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
  x86inc: Free up variable name "n" in global namespace

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