lavu/opt: validate range before dereference

This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.

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

ffmpeg: frame droping due to fps should not be a warning

This reverts part of 41e7e46cac507e993af6d656c8d3672ba3f9e304

See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec.h, avpacket.c: use const AVPacket pointers in copy functions

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER

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

avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalid

Fixes ticket #3522.

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

oggenc: check return value of av_mallocz()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: asm decode_block_coeffs_internal is vp8 specific

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

Merge commit '287432430c5c9cb8ffe1da1376949de494f24e45'

* commit '287432430c5c9cb8ffe1da1376949de494f24e45':
  fate: add a VP7 test

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

Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
  On2 VP7 decoder

Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

arm: asm decode_block_coeffs_internal is vp8 specific

Unbreaks compilation on arm due to conflicting types for
'ff_decode_block_coeffs_armv6'.

log: allow color highlighting in Cygwin's mintty

Configure will detect the availability of the Windows' console functions and set
HAVE_SETCONSOLETEXTATTRIBUTE.  Meaning av_log will use those functions to
control colours.  When ffmpeg is run in Cygwin's mintty terminal emulator it
will not use colour highlighting in this case.

Mintty responds to the usual escape code colours (it even supports 256 colours).
Windows' cmd.exe does not.  Fortunately it seems that Cygwin's emulation layer
now translates the basic 16 colours into Windows' Console command functions.

That means that we can have av_log use the standard colour commands and let
ffmpeg print colours in both mintty and cmd.

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

fate: add a VP7 test

On2 VP7 decoder

Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  riff: Add an additional AAC TwoCC
  riff: support 0xa100 TwoCC for G723_1
  riff: add 0x594a TwoCC for Xan DPCM
  riff: add 0x64 to g726
  riff: add G723_1 wav tag
  riff: map 0x0038 to amrnb
  riff: Support FLIC FourCC
  riff: add escape130 FourCC
  riff: support 'aas4' FourCC
  riff: add "YUV8" FourCC
  riff: Add "S263" FourCC
  riff: Support XMPG as mpeg1
  riff: support BW10 as mpeg1
  riff: Add SLDV FourCC for dvvideo
  riff: Support NTSC forward dvcpro videos
  riff: add dvis/pdvc FourCCs
  riff: add "GXVE" FourCC for WMV2
  riff: add PLV1 fourcc to mpeg4
  riff: Support decoding ASP variant from QNAP Systems
  riff: add "SM4V" FourCC
  ...

Conflicts:
libavformat/riff.c

See: various commits, all the merged changes where in ffmpeg already

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

Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'

* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
libavformat/isom.c

See: ca8623e1a537fa48366efebdf235442f1197bb71
See: 8a3f976498cc096644b95ade7240a73e17d3a042
See: fca62f05005567514b5daaea230ba9365e202201
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'

* commit 'ad8f736b7404503d8f5164f4879175a2258dd64b':
  mxf: Remove typo

also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon

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

Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'

* commit '9464b69da6b373d1eeb6b3d269ad029d9647b498':
  log: Unbreak windows support

Conflicts:
libavutil/log.c

No change as we didnt use print_256color() in our implementation

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

configure: check and use -Wempty-body

Would have shown the trailing semi-colon in lavu/log.c that broke detection of
256 colour capable terminals.

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

riff: Add an additional AAC TwoCC

Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx

riff: support 0xa100 TwoCC for G723_1

Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav

riff: add 0x594a TwoCC for Xan DPCM

Sample-Id: crusader-no-regret.avi

riff: add 0x64 to g726

Sample-Id: g726-test1.wav

riff: add G723_1 wav tag

riff: map 0x0038 to amrnb

Sample-Id: 40709.avi

riff: Support FLIC FourCC

riff: add escape130 FourCC

riff: support 'aas4' FourCC

riff: add "YUV8" FourCC

Sample-Id: MAILTEST.AVI

riff: Add "S263" FourCC

riff: Support XMPG as mpeg1

riff: support BW10 as mpeg1

riff: Add SLDV FourCC for dvvideo

riff: Support NTSC forward dvcpro videos

PAL looks incorrect.

riff: add dvis/pdvc FourCCs

riff: add "GXVE" FourCC for WMV2

Sample-Id: vivd.avi

riff: add PLV1 fourcc to mpeg4

Sample-Id: york-water-meteor.avi

riff: Support decoding ASP variant from QNAP Systems

riff: add "SM4V" FourCC

riff: add DYM4 mpeg4 fourcc

riff: add DM4V FourCC

riff: add G264 to mpeg4, only decodes keyframes

riff: add "lsvm" FourCC for H263.

riff: Support H.264 fourcc UMSV

riff: add FourCC for GeoVision cameras

riff: Add V264 for H264 in CCTV recordings

riff: add H264 from QNAP Systems

riff: add SMV2 FourCC for H264

Sample-Id: smv2.avi

riff: add ISMP/timecode tag

riff: Add ITRK tag

Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT

isom: add some BOXX tags

isom: add 'flic' tag

isom: add 'm1v ' tag

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

avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context()

Fixes crash

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

mxf: Remove typo

Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>

log: Unbreak windows support

Add the missing define.

avutil/log: remove stray ;

regression since  5a18b215f7138c0bd59f27389050b0311fa4a549

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

avutil/log: fix negative log levels

These where broken by 7763118cae4eb468b032dbd29af15a011c2c233b

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

avutil/log: add code to test av_log()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Do not assume the TERM variable is always set

Conflicts:
libavutil/log.c

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

Merge commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb'

* commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb':
  log: Document AV_LOG_C usage

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

Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'

* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6':
  log: Remove undefined behaviour

Conflicts:
libavutil/log.c

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

Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'

* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
  log: Support for 256color terminals

Conflicts:
doc/APIchanges
libavutil/log.c
libavutil/version.h

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

log: Factorize check_color_terminal() out

doc/ffmpeg: restore ascii arrows in Simple filtergraphs

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

Merge commit '006c253346d90f4abaf69d78083c8ba031628598'

* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

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

lavu/opt: dont crash on freeing NULL AVOptionRanges

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

log: Do not assume the TERM variable is always set

log: Document AV_LOG_C usage

And move outside the wrong doxygen group.

log: Remove undefined behaviour

Merge commit 'lukaszmluki/master^'

* commit 'lukaszmluki/master^':
  lavu/opt: extend AVOptionRange by extra values

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

log: Support for 256color terminals

And provide extended coloring capabilities for debugging.
The default colors do not change in 256 more to keep
supporting people using Black on White, White on Black and
Solarized terminals.

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

avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/utils.c: av_pkt_dump_log2: use const pointers

Use const pointers to AVPacket and AVStream.

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/opt: extend AVOptionRange by extra values

AVOptionRange is not flexible enough to store AV_OPT_TYPE_IMAGE_SIZE
ranges. Current implementation can only store pixel count.
This patch aims to keep backward compatibility and extend
AVOptionRange with possibility to store width/height ranges.

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

dict: const pointers to dictionary where possible

This avoids temporaries or ugly casting in the calling code where
const dictionaries are used. Esp. helpful when writing C++ wrappers
for an AVDictionary having const member functions and CTORs with const
references.

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: Fit the graph in 80 cols

Some man pagers do not reflow the text/graphs on resize
and the graphs did not fit the traditional 80cols due
the pod2man excessive indent.

avcodec/jpeglsdec: fix palette parsing code

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

MAINTAINER: Add CC for dshow maintainer

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

MAINTAINERS: add gdi maintainer

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

Add Win32 GDI-based screen grabbing

Based on original code by Christophe Gisquet in 2010, updated to work
with current ffmpeg APIs.

Supports grabbing a single window or an area of the screen, including
support for multiple monitors (Windows does funky stuff with negative
coordinates here).

I've moved most of the configuration to AVOptions; the input file name
is now only the string "desktop", or "title=<windowname>" to select a
single window. The AVOptions are the same as x11grab where possible.

Code has been added to support a "show_region" mode, like x11grab, which
will draw a rectangle on the screen around the area being captured.

Instead of duplicating code for paletted image handling, I make use of
the GDI API's ability to output DIB (BMP) images, which can be run
through ffmpeg's existing BMP decoder.

Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/hlsenc: remove unneeded l prefix from %lf

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

hlsenc: added floating point time support.

Necessary for HLS version 3 and above.  Fixes ticket #3505.

Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Write aspect ratio when muxing gif.

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

lavd/qtkit: Support choosing the input device by index or by name.

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

lavc/kbdwin: add missing stdint.h include

Fixes make checkheaders

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

swscale: add full bgra64 support

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

avformat/avidec: remove unused variables

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_settb: rename to settb

Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c

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

Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'

* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
  avi: Improve non-interleaved detection

Conflicts:
libavformat/avidec.c

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

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
  swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

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

vf_settb: rename to settb

An audio version of settb (asettb) will be added to this file.

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

avi: Improve non-interleaved detection

Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>.

Check the index for streams with a time drift of 2s or a buffer drift
of 64MB.

Bug-Id: 666
CC: libav-stable@libav.org
Sample-Id: yet-another-broken-interleaved-avi.avi

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Write aspect ratio when muxing gif.

Changelog: remove unecessary "added"

avcodec/ac3dec: use av_freep() for saftey

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dec: fix a possible unitialized variable warning

Conflicts:
libavcodec/vc1dec.c

No change as the variables where not uninitialized in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'

* commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509':
  lavf: add supported extension to avi and mov demuxers

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

Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'

* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
  More correct printf format specifiers

Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c

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

Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'

* commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e':
  lavu: add missing formats to av_pix_fmt_swap_endianness

Conflicts:
libavutil/pixdesc.c

No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually

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