mjpegdec: Fix used quant index for gbr

Fixes Ticket1651

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

mjpegdec: initialize source variables before gbr remap

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

lavf/segment: use AV_OPT_TIME_DURATION for time_delta

Simplify.

lavf/segment: reindent after last commit

lavf/segment: add initial_offset option

Should address trac ticket #2224.

doc/formats: add section describing stream specifiers

doc/developer: update sections about external development

Replace the sections "API" and "Integrating libavcodec or libavformat"
with updated / more accurate text.

See thread:
Subject: [FFmpeg-devel] [PATCH] doc/developer: merge and update sections about external development
Date: Fri,  5 Jul 2013 11:07:07 +0200

lavfi/aevalsrc: do not free AVOption variables in uninit()

The generic code frees them already.

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

lavfi/aevalsrc: use AV_OPT_TYPE_DURATION

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

lavfi/afade: use av_rescale()

Should not make a difference, but its good idea.

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

fate: Always enable avresample

There's no reason we shouldn't be testing it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

wmalosslessdec: do not set avctx->coded_frame

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

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

avfilter/af_earwax: Fix out of array accesses on odd packets

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

avcodec/qdm2: initialize sign_bits

Fixes non deterministic output

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

Suggest recompilation with openssl or gnutls if the https protocol is not found.

Fixes ticket #2765.

lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

avcodec/qdm2: store bits in an integer instead of float variable

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

avformat/utils: avformat_find_stream_info set value for ret in case of oom

without it FFmpeg didn't display any error message when oom event occured

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d5a50d976b5f2a4abd6932185672d91

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

lavfi/aconvert: unbreak

Even if its deprecated, it should still work correctly.

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

Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'

* commit 'adadc3f2443d25b375e21e801516ccfd78e0b080':
  qdm2: refactor joined stereo support

Conflicts:
libavcodec/qdm2.c

See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61

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

fate/crc fix after master:410192e36958: add crc24 tables

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

lavfi: add aecho filter

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

lavf/takdec: check metadata blocks checksum

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

tak: use crc table from lavu

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

add crc24 tables

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

Merge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'

* commit '12576afe206d35231ccd61f9033c5fdab6a11e80':
  adpcm: Write the correct number of samples for ima-dk4

Conflicts:
libavcodec/adpcm.c

See: f18c873ab5ee3c78d00fdcc2582b39c133faecb4

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

Merge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'

* commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7':
  imc: Catch a division by zero
  atrac3: Error on impossible encoding/channel combinations

See: 13451f5520ce6b0afde861b2285dda659f8d4fb4

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

Merge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'

* commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e':
  atrac3: set the getbits context the right buffer_end
  atrac3: fix error handling

Conflicts:
libavcodec/atrac3.c

No change as these issues have been fixed previously
See: c8f25cafd2f23662bcb1e62965c0c42d6989688a
See: 5eaed6d33689cc6f6e7c07463ede6b387b08afc4

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

avformat/utils: avformat_find_stream_info fix a crash in case of oom

fixes ticket #2767

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

Changelog: add back the <next> placeholder for new changes

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

Update back for git master

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

Changelog: replace next by 2.0

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

Update for 2.0

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

atrac3: fix error handling

decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/gif: Do not write GIF89a header if loop is set to -1.

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: assume 0 stream start time if start time is unset in duration check
  ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

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

MAINTAINERS: Update which releases are supported

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

codec_desc: fix typo in rv20 long_name.

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

doc/RELEASE_NOTES: add a note about AVISynth

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

jpegdec: clear EOBRUN on restarts

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

jpegdec: give handle_rstn() a return code that indicates if restart did happen

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

mjpeg_decode_scan: reset restart state

Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

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

doc/ffmpeg: document -override_ffserver

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

snowenc: check minimum resolution

Fixes Ticket1855

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

ffplay: assume 0 stream start time if start time is unset in duration check

Fixes ticket #2103 and #2743.

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

ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE

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

bitstream: fix a crash in case of oom

fixes ticket #2766

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

vorbiscomment: Add support for embedded cover art

Fixes ticket #2655

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

lavf/flacdec: Share the function to parse cover art blocks

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

avformat/AVFormatContext: Move fields down to match the fork

avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu

The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.

minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct

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

avfilter/graphparse: Fix build with --enable-incompatible-fork-abi

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

lavfi/drawtext: add support for printing frame metadata

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

imc: Catch a division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

qdm2: Conceal broken samples

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

qdm2: refactor joined stereo support

qdm2 does support only two channels. Loop over the run once.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avcodec/wmaprodec: Check block_align

Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Force correct extradata for AVID AVCI50 in mov.

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

ff_lpc_calc_coefs: assert that the type is levinson or cholesky

Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759

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

Force correct extradata for AVID AVCI50 in mov.

Fixes ticket #2106.

Reviewed-by: Kieran Kunhya

lavfi/psnr: rename 's' parameter to match documentation

Also removes some irrelevant lines in documentation.

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

ffmpeg_opt: do not warn about unused gop_timecode

The option is injected by generic code and being sometimes unused is normal.

Fixes Ticket2762

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

adpcm: Write the correct number of samples for ima-dk4

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

imc: Catch a division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

atrac3: set the getbits context the right buffer_end

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

atrac3: Error on impossible encoding/channel combinations

Joint stereo encoded mono is impossible.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

atrac3: fix error handling

decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Rename the timestamp parameter to dts in write_hint_packets

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

Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'

* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
  movenc: Make sure the RTP hint tracks have nondecreasing DTS

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

avcodec/h264_ps: try to support Ambarella AVC

Fixes Ticket2763

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

WebM muxer writes WebVTT subtitle track

The Matroska muxer now allows WebVTT subtitle tracks to be written
while in WebM muxing mode.

WebVTT subtitle tracks have four kinds: "subtitles", "captions",
"descriptions", and "metadata". Each text track kind has a distinct
Mastroska CodecID and track type, as described in the temporal
metadata guidelines here:

http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm

When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is
serialized per the temporal metadata guidelines cited above. The
WebVTT cue is written as a Matroska block group. The block frame
comprises the WebVTT cue id, followed by the cue settings, followed by
the cue text.  (The block timestamp is synthesized from the cue
timestamp.)

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

avcodec/libvpxenc: make class names unique

This should fix an infinite loop with -h full

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

ffmpeg: Allow overriding ffservers input

Fixes Ticket1970

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

ffmpeg: move creation_time for ffserver setting up

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

lavfi: fix broken logic in metadata handling

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

mpeg12dec: avoid reinitializtation on PS changes when possible.

Fixes Ticket2574

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

tests/fate/filter-audio: update asyncts reference

The new reference matches the one used by qatar

Fixes: fate-filter-asyncts

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

lavfi/rotate: switch to new drawutils

Get rid of ugly hacks, also add support for more pixel formats.

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

lavfi/drawutils: fix planar rgb

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

lavfi/pad: use FFSIGN

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

avformat/mov: read stream bitrates from isml manifest

This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.

Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mp3dec: detect CBR and use CBR axiom to seek

This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590

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

lavfi: add psnr filter

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

swscale: treat gray as a fullrage (0-255) format

Fixes Ticket2684

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

Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c

Avoids possible null pointer dereferences on oom.

Fixes ticket #2727.

movenc: Rename the timestamp parameter to dts in write_hint_packets

This matches its actual intended use better.

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

movenc: Make sure the RTP hint tracks have nondecreasing DTS

The RTP timestamps can be decreasing for codecs with B-frames. For
these cases, make sure the timestamps in the MP4 file track itself
are nondecreasing, and add an offset to the RTP packet hint instead
to produce the intended RTP timestamp.

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

cmdutils: replace exit() by exit_program()

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

ffmpeg_opt: replace exit() by exit_program()

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

ffmpeg_filter: replace exit() by exit_program()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: check and reset dithering index per channel

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

Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
libavcodec/qdm2.c

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

Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'

* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
  qdm2: use init_static_data
  westwood_vqa: do not free extradata on error in read_header

Conflicts:
libavformat/westwood_vqa.c

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

Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

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

Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c

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

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
libavformat/movenc.c

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

Merge commit '38e9585de993c32899588ab037180f2c930ce74c'

* commit '38e9585de993c32899588ab037180f2c930ce74c':
  Makefile: Remove stray tabs
  vp8: Wait for prev_frame to parse segment_map before reading it
  yuv4mpeg: Correctly round chroma up for odd luma sizes
  rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
  avio: Handle AVERROR_EOF in the same way as the return value 0

Conflicts:
libavformat/rmdec.c
libavformat/yuv4mpeg.c

No change as all the commits where already in before

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

avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases

This fixes speex in rtmp
Fixes Ticket2409

the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration

If this causes any problems, like premature analyze/probe end, please report!

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

zmbvenc: remove unused AVFrame from encoder private context

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