ffmpeg.git
6 years agodoc/formats: add section describing stream specifiers
Stefano Sabatini [Sat, 6 Jul 2013 08:27:19 +0000 (10:27 +0200)]
doc/formats: add section describing stream specifiers

6 years agodoc/developer: update sections about external development
Stefano Sabatini [Fri, 5 Jul 2013 08:22:03 +0000 (10:22 +0200)]
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

6 years agolavfi/aevalsrc: do not free AVOption variables in uninit()
Paul B Mahol [Wed, 10 Jul 2013 19:18:48 +0000 (19:18 +0000)]
lavfi/aevalsrc: do not free AVOption variables in uninit()

The generic code frees them already.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/aevalsrc: use AV_OPT_TYPE_DURATION
Paul B Mahol [Wed, 10 Jul 2013 18:42:47 +0000 (18:42 +0000)]
lavfi/aevalsrc: use AV_OPT_TYPE_DURATION

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/afade: use av_rescale()
Paul B Mahol [Wed, 10 Jul 2013 19:08:16 +0000 (19:08 +0000)]
lavfi/afade: use av_rescale()

Should not make a difference, but its good idea.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: Always enable avresample
Derek Buitenhuis [Mon, 8 Jul 2013 20:02:57 +0000 (16:02 -0400)]
fate: Always enable avresample

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agowmalosslessdec: do not set avctx->coded_frame
Paul B Mahol [Wed, 10 Jul 2013 13:50:38 +0000 (13:50 +0000)]
wmalosslessdec: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 10 Jul 2013 17:58:15 +0000 (19:58 +0200)]
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>
6 years agoavfilter/af_earwax: Fix out of array accesses on odd packets
Michael Niedermayer [Wed, 10 Jul 2013 14:39:10 +0000 (16:39 +0200)]
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>
6 years agoavcodec/qdm2: initialize sign_bits
Michael Niedermayer [Wed, 10 Jul 2013 14:21:33 +0000 (16:21 +0200)]
avcodec/qdm2: initialize sign_bits

Fixes non deterministic output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSuggest recompilation with openssl or gnutls if the https protocol is not found.
Carl Eugen Hoyos [Wed, 10 Jul 2013 11:16:28 +0000 (13:16 +0200)]
Suggest recompilation with openssl or gnutls if the https protocol is not found.

Fixes ticket #2765.

6 years agolavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
Carl Eugen Hoyos [Wed, 10 Jul 2013 11:15:57 +0000 (13:15 +0200)]
lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

6 years agoavcodec/qdm2: store bits in an integer instead of float variable
Michael Niedermayer [Wed, 10 Jul 2013 14:18:52 +0000 (16:18 +0200)]
avcodec/qdm2: store bits in an integer instead of float variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: avformat_find_stream_info set value for ret in case of oom
Piotr Bandurski [Wed, 10 Jul 2013 12:57:15 +0000 (14:57 +0200)]
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>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 10 Jul 2013 13:47:50 +0000 (15:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: Conceal broken samples

See: 5ee008e01d5a50d976b5f2a4abd6932185672d91

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/aconvert: unbreak
Paul B Mahol [Wed, 10 Jul 2013 13:10:07 +0000 (13:10 +0000)]
lavfi/aconvert: unbreak

Even if its deprecated, it should still work correctly.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'
Michael Niedermayer [Wed, 10 Jul 2013 12:53:05 +0000 (14:53 +0200)]
Merge commit 'adadc3f2443d25b375e21e801516ccfd78e0b080'

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

Conflicts:
libavcodec/qdm2.c

See: 2b12d1ffd841cf57976b124c1882e4a23a7c5f61

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/crc fix after master:410192e36958: add crc24 tables
Michael Niedermayer [Wed, 10 Jul 2013 12:58:52 +0000 (14:58 +0200)]
fate/crc fix after master:410192e36958: add crc24 tables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: add aecho filter
Paul B Mahol [Mon, 8 Jul 2013 13:44:35 +0000 (13:44 +0000)]
lavfi: add aecho filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/takdec: check metadata blocks checksum
Paul B Mahol [Tue, 4 Jun 2013 19:24:48 +0000 (19:24 +0000)]
lavf/takdec: check metadata blocks checksum

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotak: use crc table from lavu
Paul B Mahol [Tue, 4 Jun 2013 16:41:05 +0000 (16:41 +0000)]
tak: use crc table from lavu

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoadd crc24 tables
Paul B Mahol [Tue, 4 Jun 2013 15:05:48 +0000 (15:05 +0000)]
add crc24 tables

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '12576afe206d35231ccd61f9033c5fdab6a11e80'
Michael Niedermayer [Wed, 10 Jul 2013 10:56:10 +0000 (12:56 +0200)]
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>
6 years agoMerge commit 'bbf6a4aa20bfe3d7869b2218e66063602dfb8aa7'
Michael Niedermayer [Wed, 10 Jul 2013 10:24:58 +0000 (12:24 +0200)]
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>
6 years agoMerge commit '22e76ec635bafdd1d1ec35581a7ac09e69e3c43e'
Michael Niedermayer [Wed, 10 Jul 2013 10:13:09 +0000 (12:13 +0200)]
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>
6 years agoavformat/utils: avformat_find_stream_info fix a crash in case of oom
Piotr Bandurski [Wed, 10 Jul 2013 00:51:41 +0000 (02:51 +0200)]
avformat/utils: avformat_find_stream_info fix a crash in case of oom

fixes ticket #2767

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: add back the <next> placeholder for new changes
Michael Niedermayer [Wed, 10 Jul 2013 01:14:33 +0000 (03:14 +0200)]
Changelog: add back the <next> placeholder for new changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUpdate back for git master n2.1-dev
Michael Niedermayer [Wed, 10 Jul 2013 01:13:06 +0000 (03:13 +0200)]
Update back for git master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: replace next by 2.0 n2.0
Michael Niedermayer [Wed, 10 Jul 2013 00:47:10 +0000 (02:47 +0200)]
Changelog: replace next by 2.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUpdate for 2.0
Michael Niedermayer [Tue, 9 Jul 2013 23:52:51 +0000 (01:52 +0200)]
Update for 2.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatrac3: fix error handling
Luca Barbato [Mon, 8 Jul 2013 23:03:13 +0000 (01:03 +0200)]
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>
6 years agoavformat/gif: Do not write GIF89a header if loop is set to -1.
Eugene Dzhurinsky [Sat, 6 Jul 2013 00:27:56 +0000 (20:27 -0400)]
avformat/gif: Do not write GIF89a header if loop is set to -1.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 9 Jul 2013 22:57:00 +0000 (00:57 +0200)]
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>
6 years agoMAINTAINERS: Update which releases are supported
Michael Niedermayer [Tue, 9 Jul 2013 22:47:01 +0000 (00:47 +0200)]
MAINTAINERS: Update which releases are supported

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocodec_desc: fix typo in rv20 long_name.
Alexis Ballier [Tue, 9 Jul 2013 19:10:16 +0000 (15:10 -0400)]
codec_desc: fix typo in rv20 long_name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/RELEASE_NOTES: add a note about AVISynth
Michael Niedermayer [Tue, 9 Jul 2013 22:24:04 +0000 (00:24 +0200)]
doc/RELEASE_NOTES: add a note about AVISynth

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: clear EOBRUN on restarts
Michael Niedermayer [Tue, 9 Jul 2013 21:46:29 +0000 (23:46 +0200)]
jpegdec: clear EOBRUN on restarts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpegdec: give handle_rstn() a return code that indicates if restart did happen
Michael Niedermayer [Tue, 9 Jul 2013 21:45:31 +0000 (23:45 +0200)]
jpegdec: give handle_rstn() a return code that indicates if restart did happen

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpeg_decode_scan: reset restart state
Michael Niedermayer [Tue, 9 Jul 2013 21:43:36 +0000 (23:43 +0200)]
mjpeg_decode_scan: reset restart state

Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffmpeg: document -override_ffserver
Michael Niedermayer [Tue, 9 Jul 2013 19:42:27 +0000 (21:42 +0200)]
doc/ffmpeg: document -override_ffserver

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowenc: check minimum resolution
Michael Niedermayer [Tue, 9 Jul 2013 19:10:45 +0000 (21:10 +0200)]
snowenc: check minimum resolution

Fixes Ticket1855

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: assume 0 stream start time if start time is unset in duration check
Marton Balint [Sun, 7 Jul 2013 00:54:22 +0000 (02:54 +0200)]
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>
6 years agoffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Marton Balint [Sat, 6 Jul 2013 18:47:12 +0000 (20:47 +0200)]
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>
6 years agobitstream: fix a crash in case of oom
Piotr Bandurski [Tue, 9 Jul 2013 17:29:26 +0000 (19:29 +0200)]
bitstream: fix a crash in case of oom

fixes ticket #2766

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbiscomment: Add support for embedded cover art
James Almer [Tue, 9 Jul 2013 05:39:10 +0000 (02:39 -0300)]
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>
6 years agolavf/flacdec: Share the function to parse cover art blocks
James Almer [Tue, 9 Jul 2013 05:39:09 +0000 (02:39 -0300)]
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>
6 years agoavformat/AVFormatContext: Move fields down to match the fork
Michael Niedermayer [Tue, 9 Jul 2013 16:34:01 +0000 (18:34 +0200)]
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>
6 years agoavfilter/graphparse: Fix build with --enable-incompatible-fork-abi
Michael Niedermayer [Tue, 9 Jul 2013 16:10:33 +0000 (18:10 +0200)]
avfilter/graphparse: Fix build with --enable-incompatible-fork-abi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawtext: add support for printing frame metadata
Paul B Mahol [Mon, 8 Jul 2013 18:55:08 +0000 (18:55 +0000)]
lavfi/drawtext: add support for printing frame metadata

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoimc: Catch a division by zero
Luca Barbato [Tue, 9 Jul 2013 07:19:30 +0000 (09:19 +0200)]
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>
6 years agoqdm2: Conceal broken samples
Luca Barbato [Tue, 9 Jul 2013 12:59:33 +0000 (14:59 +0200)]
qdm2: Conceal broken samples

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoqdm2: refactor joined stereo support
Luca Barbato [Tue, 9 Jul 2013 12:44:02 +0000 (14:44 +0200)]
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
6 years agoavcodec/wmaprodec: Check block_align
Michael Niedermayer [Tue, 9 Jul 2013 12:01:13 +0000 (14:01 +0200)]
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>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 9 Jul 2013 11:04:46 +0000 (13:04 +0200)]
Merge remote-tracking branch 'cehoyos/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_lpc_calc_coefs: assert that the type is levinson or cholesky
Michael Niedermayer [Tue, 9 Jul 2013 09:19:27 +0000 (11:19 +0200)]
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>
6 years agoForce correct extradata for AVID AVCI50 in mov.
Carl Eugen Hoyos [Tue, 9 Jul 2013 08:19:21 +0000 (10:19 +0200)]
Force correct extradata for AVID AVCI50 in mov.

Fixes ticket #2106.

Reviewed-by: Kieran Kunhya
6 years agolavfi/psnr: rename 's' parameter to match documentation
Paul B Mahol [Tue, 9 Jul 2013 09:38:47 +0000 (09:38 +0000)]
lavfi/psnr: rename 's' parameter to match documentation

Also removes some irrelevant lines in documentation.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg_opt: do not warn about unused gop_timecode
Michael Niedermayer [Tue, 9 Jul 2013 08:54:40 +0000 (10:54 +0200)]
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>
6 years agoadpcm: Write the correct number of samples for ima-dk4
Luca Barbato [Sun, 7 Jul 2013 10:56:12 +0000 (12:56 +0200)]
adpcm: Write the correct number of samples for ima-dk4

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoimc: Catch a division by zero
Luca Barbato [Tue, 9 Jul 2013 07:18:16 +0000 (09:18 +0200)]
imc: Catch a division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoatrac3: set the getbits context the right buffer_end
Luca Barbato [Tue, 9 Jul 2013 02:20:23 +0000 (04:20 +0200)]
atrac3: set the getbits context the right buffer_end

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoatrac3: Error on impossible encoding/channel combinations
Luca Barbato [Tue, 9 Jul 2013 02:44:26 +0000 (04:44 +0200)]
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
6 years agoatrac3: fix error handling
Luca Barbato [Mon, 8 Jul 2013 23:03:13 +0000 (01:03 +0200)]
atrac3: fix error handling

decode_tonal_components returns a proper AVERROR.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 9 Jul 2013 08:07:01 +0000 (10:07 +0200)]
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>
6 years agoMerge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'
Michael Niedermayer [Tue, 9 Jul 2013 07:59:29 +0000 (09:59 +0200)]
Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_ps: try to support Ambarella AVC
Michael Niedermayer [Tue, 9 Jul 2013 03:21:26 +0000 (05:21 +0200)]
avcodec/h264_ps: try to support Ambarella AVC

Fixes Ticket2763

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoWebM muxer writes WebVTT subtitle track
Matthew Heaney [Mon, 8 Jul 2013 23:25:30 +0000 (16:25 -0700)]
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>
6 years agoavcodec/libvpxenc: make class names unique
Michael Niedermayer [Tue, 9 Jul 2013 00:57:05 +0000 (02:57 +0200)]
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>
6 years agoffmpeg: Allow overriding ffservers input
Michael Niedermayer [Mon, 8 Jul 2013 23:48:29 +0000 (01:48 +0200)]
ffmpeg: Allow overriding ffservers input

Fixes Ticket1970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: move creation_time for ffserver setting up
Michael Niedermayer [Mon, 8 Jul 2013 23:40:11 +0000 (01:40 +0200)]
ffmpeg: move creation_time for ffserver setting up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: fix broken logic in metadata handling
Paul B Mahol [Mon, 8 Jul 2013 20:13:14 +0000 (20:13 +0000)]
lavfi: fix broken logic in metadata handling

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompeg12dec: avoid reinitializtation on PS changes when possible.
Michael Niedermayer [Mon, 8 Jul 2013 19:46:20 +0000 (21:46 +0200)]
mpeg12dec: avoid reinitializtation on PS changes when possible.

Fixes Ticket2574

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/filter-audio: update asyncts reference
Michael Niedermayer [Mon, 8 Jul 2013 17:30:37 +0000 (19:30 +0200)]
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>
6 years agolavfi/rotate: switch to new drawutils
Paul B Mahol [Mon, 8 Jul 2013 15:12:11 +0000 (15:12 +0000)]
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>
6 years agolavfi/drawutils: fix planar rgb
Paul B Mahol [Mon, 8 Jul 2013 15:17:33 +0000 (15:17 +0000)]
lavfi/drawutils: fix planar rgb

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/pad: use FFSIGN
Paul B Mahol [Mon, 8 Jul 2013 15:33:40 +0000 (15:33 +0000)]
lavfi/pad: use FFSIGN

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/mov: read stream bitrates from isml manifest
Alexandre Sicard [Mon, 8 Jul 2013 09:56:40 +0000 (11:56 +0200)]
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>
6 years agomp3dec: detect CBR and use CBR axiom to seek
Michael Niedermayer [Sun, 7 Jul 2013 11:15:32 +0000 (13:15 +0200)]
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>
6 years agolavfi: add psnr filter
Paul B Mahol [Sat, 6 Jul 2013 00:21:12 +0000 (00:21 +0000)]
lavfi: add psnr filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale: treat gray as a fullrage (0-255) format
Michael Niedermayer [Sat, 6 Jul 2013 00:37:28 +0000 (02:37 +0200)]
swscale: treat gray as a fullrage (0-255) format

Fixes Ticket2684

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoCheck the return value of ff_rv34_decode_init() in rv30.c and rv40.c
Carl Eugen Hoyos [Sun, 7 Jul 2013 22:34:58 +0000 (00:34 +0200)]
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.

6 years agomovenc: Rename the timestamp parameter to dts in write_hint_packets
Martin Storsjö [Sun, 7 Jul 2013 14:03:00 +0000 (17:03 +0300)]
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>
6 years agomovenc: Make sure the RTP hint tracks have nondecreasing DTS
Martin Storsjö [Sun, 7 Jul 2013 13:55:26 +0000 (16:55 +0300)]
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>
6 years agocmdutils: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:10:02 +0000 (11:10 +0200)]
cmdutils: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:09:42 +0000 (11:09 +0200)]
ffmpeg_opt: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: replace exit() by exit_program()
Michael Niedermayer [Mon, 8 Jul 2013 09:09:22 +0000 (11:09 +0200)]
ffmpeg_filter: replace exit() by exit_program()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 8 Jul 2013 03:15:10 +0000 (05:15 +0200)]
Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
Michael Niedermayer [Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)]
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
Michael Niedermayer [Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)]
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>
6 years agoMerge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
Michael Niedermayer [Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)]
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
Michael Niedermayer [Mon, 8 Jul 2013 02:34:11 +0000 (04:34 +0200)]
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

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

Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '21732063a346475eb22c332b27e8216b79f9ad4a'
Michael Niedermayer [Mon, 8 Jul 2013 02:08:07 +0000 (04:08 +0200)]
Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

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

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '38e9585de993c32899588ab037180f2c930ce74c'
Michael Niedermayer [Mon, 8 Jul 2013 01:41:33 +0000 (03:41 +0200)]
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>
6 years agoavformat_find_stream_info: fallback to timestamps in analyzeduration check in more...
Michael Niedermayer [Mon, 8 Jul 2013 00:19:28 +0000 (02:19 +0200)]
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>
6 years agozmbvenc: remove unused AVFrame from encoder private context
Paul B Mahol [Sun, 7 Jul 2013 23:50:54 +0000 (23:50 +0000)]
zmbvenc: remove unused AVFrame from encoder private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agozmbvenc: do not set avctx->coded_frame
Paul B Mahol [Sun, 7 Jul 2013 23:45:17 +0000 (23:45 +0000)]
zmbvenc: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogif: remove unused AVFrame from encoder private context
Paul B Mahol [Sun, 7 Jul 2013 23:06:06 +0000 (23:06 +0000)]
gif: remove unused AVFrame from encoder private context

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agogif: do not set avctx->coded_frame
Paul B Mahol [Sun, 7 Jul 2013 22:56:21 +0000 (22:56 +0000)]
gif: do not set avctx->coded_frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoqdm2: check and reset dithering index per channel
Luca Barbato [Thu, 27 Jun 2013 00:50:52 +0000 (02:50 +0200)]
qdm2: check and reset dithering index per channel

Checking per subband would have the index exceed the
dithering noise table size.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
6 years agoqdm2: formatting cosmetics
Luca Barbato [Thu, 27 Jun 2013 00:49:15 +0000 (02:49 +0200)]
qdm2: formatting cosmetics

Apply the usual style plus drop few unnecessary return at the end
of void functions.