sctp: silence const warning

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

ffmdec: remove unused variable

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

libopencore-amr: fix av_log() argument

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvpxenc: Allow enabling constrained quality (CQ) mode

Conflicts:
configure
libavcodec/libvpxenc.c

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

rtpenc_aac: Fix 10l bug

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

doc/faq: replace @file by @command for "ffmpeg".

doc/libavcodec: hint to where to find the Git history

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>

doc/Makefile: change DOCLIBS check

More consistent with the rest of the build system, and more compact.

lavu: remove disabled FF_API_OLD_EVAL_NAMES code

lavu/opt: show valid range in case of out-of-range value

Improve feedback.

libvpxenc: Allow enabling constrained quality (CQ) mode

The CQ mode was introduced in libvpx 0.9.6.

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

Fix the packet duration when flushing the encoder.

A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com>

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

fate-rsync: replace -a by -rlt

This remove the owner, group and permission preservation on fatesample checkouts
These caused problems for durandal_1707

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

gsm_parser: fix infinite loop

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

adpcm: improve smjpeg decoding

Previous version had significant artifacts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

wtvenc: produce seekable files

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

wtvenc: simplify write_timestamp

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

wtvenc: output third video pts in timestamp chunk (this is what Microsoft Windows Media Center expects)

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

wtvenc: indent fixup

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

wtvenc: do not emit stream2 and DSATTRIB_TRANSPORT_PROPERTY chunks; these are not required for playback

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

ffv1dec: propagate return code from ffv1_common_init()

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

ffv1dec: more completely check slice count

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopencore-amr: Check the return value of amr_decode_fix_avctx

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

smjpegenc: use bits_per_coded_sample instead of calling function

Final result is same and this allows support of multiple values per codec.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

kgv1dec: fix end condition

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

libopencore-amr: Check the return value of amr_decode_fix_avctx

This allows getting rid of redundant checks later in the codec
specific init functions.

Move the check to before actually initializing the decoder lib,
to simplify error handling.

This fixes a case of returning a value from a void function, present since
d40dab907.

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

lavfi/movie: return proper error code in case of av_get_token() allocation failure

Also slightly clarify logic, and should fix coverity issue CID 717771.

ffprobe: fix potential NULL pointer dereference

Found by Coverity, should fix CID 733741.

lavfi/showwaves: return error in case of allocation failure in filter_samples()

lavfi/showwaves: simplify check in filter_samples()

Also fix Coverity issue CID 733743: Dereference after null check

sbgdec: dont set slide to a uninitialized value

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

vf_drawbox: dont move uninitialized and then unused colors around

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

utils: fix integer overflow with DURATION_MAX_READ_SIZE

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

fate: add PMP demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>

wavpack: check if number of samples is not too big

Wavpack format documentation mentions that 131072 is
max number of samples.

This fixes huge memory allocations in sample from ticket #1889.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

wtv: move duplicated guids into wtv.c

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

wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT

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

wtvenc: fix typo

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: atrac: Place atrac1 and atrac3 tests in different groups
  fate: aac: cosmetics: Group AAC LATM tests together
  x86: avresample: Add missing colons to assembly labels

Conflicts:
tests/fate/aac.mak

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

wavpack: use more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>

fate: atrac: Place atrac1 and atrac3 tests in different groups

fate: aac: cosmetics: Group AAC LATM tests together

.gitignore: ignore *.3 files as well

doc/Makefile: remove .3 file with make clean

x86: avresample: Add missing colons to assembly labels

YASM accepts labels without colons, but NASM issues warnings.

doc/libavcodec: do not say multimedia streams in the title

The mention of multimedia stream sounds more like multiple
elementary media streams like video and audio multiplexed
into a multimedia container format.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/libavcodec: improve wording in description

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/ffserver: fix typos/reword paragraphs about FFM versions

examples/muxing: fix typo: allocated -> allocate

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: adjust external clock speed based on buffer fullness for realtime sources

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

img2enc: support 16bit per sample yuv in split planes.

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

MAINTAINERS: fix entry for img2

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

img2enc: support storing alpha planes too in split plane mode

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

img2enc: Fix yuva with yuv split planes.

Previously the chroma planes where corrupted in this case.

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

img2enc: check pix_fmt for split planes mode.

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

img2enc: ensure that the codec is rawvideo for split planes mode.

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

examples/demuxing: fix braino

s/video/audio/ in a log message.

examples/demuxing: dump input information *after* trying to open audio stream

Implement more logical code flow.

fate: add more pix_fmt tests for xwd

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a 24-bit FLAC encoding test
  FATE: rename FLAC tests from flac-* to flac-16-*
  flacenc: use RICE2 entropy coding mode for 24-bit
  flacenc: add 24-bit encoding
  flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

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

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak

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

Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
  x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
  x86: PABSW: port to cpuflags
  x86: vc1dsp: port to cpuflags
  rtmp: Use av_strlcat instead of strncat

Conflicts:
libavcodec/x86/h264_qpel.c

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

rtmpproto: Use av_strlcat instead of strncat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.

avrndec: use more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavf/avr: make .long_name consistent with others

Signed-off-by: Paul B Mahol <onemda@gmail.com>

cljr: use meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>

FATE: add a 24-bit FLAC encoding test

flacenc: use uint64_t for bit counts

Needed to avoid integer overflows for 24-bit encoding.

FATE: rename FLAC tests from flac-* to flac-16-*

This will distinguish FLAC 16-bit tests from FLAC tests with other bit
depths.

flacenc: remove wasted trailing 0 bits

flacenc: use RICE2 entropy coding mode for 24-bit

flacenc: add 24-bit encoding

flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

Also, templatize the functions for 16-bit and 32-bit sample range. This will
be used for 24-bit FLAC encoding.

lavu: add av_ctz() for trailing zero bit count

flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian

This is much faster than calculating the MD5 one sample at a time.

udp: check ff_socket_nonblock() return code

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

fate: aac: Place LATM tests and general AAC tests in different groups

build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled

This fixes compilation with --disable-everything and components enabled.

segment: fix null ptr deref

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

AVR demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>

dpcm: use AV_LOG_ERROR for error message.

riff: add "lsvm" FourCC for H263.

docs/ffserver: document ffm/ffm2

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

ffm: redesign header format to make it extensible

Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.

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

fate: add more pix_fmt tests for pam

Signed-off-by: Paul B Mahol <onemda@gmail.com>

x86: PABSW: port to cpuflags

x86: vc1dsp: port to cpuflags

rtmp: Use av_strlcat instead of strncat

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

lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE

Signed-off-by: Paul B Mahol <onemda@gmail.com>

frame_thread_encoder: fix handling of case where the encoder does not output a packet.

This case could cause a deadlock

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

fate: add smjpegenc test

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavf/srtdec: recognize subtitles starting at event index 0.

Write tiff tag YCbCrPositioning if chroma_sample_location is top-left.

fate: try to fix mxpeg failures

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

pnm: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>

pnm: remove duplicated check for maxval > 255

Signed-off-by: Paul B Mahol <onemda@gmail.com>

filmstripenc: fix rounding that caused fate failure

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

oggenc: remove unneeded null check.

The code would have segfaulted before if it where null

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

oss: warn when non block mode cannot be enabled.

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