Jean Delvare [Sat, 13 Jul 2013 14:50:42 +0000 (16:50 +0200)]
lavfi/delogo: Fix sign extension issue
Coverity complains about a possible sign extension issue in
apply_delogo(). While it is extremely unlikely to happen, it is easy
to fix so let's just do that. Using unsigned variables even makes the
binary code smaller.
Fixes Coverity CID
1046439.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Jul 2013 14:18:06 +0000 (16:18 +0200)]
avcodec/012v: improve stride selection
Fixes decoding some files
Fixes Ticket2126
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Jul 2013 03:02:42 +0000 (05:02 +0200)]
ffplay: remove explicit idct option
this allows named idct options to be used
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Jul 2013 00:24:56 +0000 (02:24 +0200)]
jpeg2000: fix overflow in dequantization
Fixes decoding of file generated with:
ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Jul 2013 10:22:17 +0000 (12:22 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
jpeg2000: Initialize only once mqc arrays
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas Bertrand [Fri, 12 Jul 2013 21:15:43 +0000 (23:15 +0200)]
jpeg2000: Initialize only once mqc arrays
Improves decoding speed.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Nicolas Bertrand [Fri, 12 Jul 2013 21:01:43 +0000 (23:01 +0200)]
jpeg2000: Initialize only once mqc arrays
Increases encoding and decoding speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Jul 2013 19:51:48 +0000 (19:51 +0000)]
lavf: add missing build dependency for tta demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andrey Utkin [Wed, 10 Jul 2013 21:19:05 +0000 (00:19 +0300)]
retry_transfer_wrapper(): check for interrupt before operation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Fri, 12 Jul 2013 07:35:51 +0000 (10:35 +0300)]
ff_network_wait_fd_timeout(): check for interrupt before operation
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 19:21:29 +0000 (21:21 +0200)]
avfilter/trim: add compatibility layer to not break ABI used by ffmpeg
This is a hotfix to fix -t / -ss
a different solution might be choosen later, i just dont want to leave
this broken
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 12 Jul 2013 19:27:21 +0000 (21:27 +0200)]
Fix compilation with --disable-everything --enable-demuxer=aac.
Paul B Mahol [Wed, 10 Jul 2013 18:25:53 +0000 (18:25 +0000)]
lavfi/trim: use AV_OPT_TYPE_DURATION
Workarounds for rounding differences between platforms should not be
needed any more.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 11 Jul 2013 17:37:29 +0000 (19:37 +0200)]
avcodec/jpeglsdec: Implement the 4th (lossy) transform
Fixes remainder of Ticket893
Std deviation from the intended image is 0.11, max sample error +-1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 12 Jul 2013 01:23:02 +0000 (01:23 +0000)]
lavfi/aevalsrc: remove hard limit on number of channels
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 12 Jul 2013 12:58:41 +0000 (14:58 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: better handling of odd video size
Conflicts:
libavfilter/vf_interlace.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 12:49:55 +0000 (14:49 +0200)]
Merge commit '
52ea29867070243385220a223d7512ea7d4ae2d2'
* commit '
52ea29867070243385220a223d7512ea7d4ae2d2':
fate: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 12:42:00 +0000 (14:42 +0200)]
Merge commit '
3802833bc1f79775a1547c5e427fed6e92b77e53'
* commit '
3802833bc1f79775a1547c5e427fed6e92b77e53':
dca: Respect the current limits in the downmixing capabilities
Conflicts:
libavcodec/dcadec.c
See:
8e77c3846e91b1af9df4084736257d9899156eef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 12:13:04 +0000 (14:13 +0200)]
Merge commit '
f261e508459e28beca59868a878e1519a44bb678'
* commit '
f261e508459e28beca59868a878e1519a44bb678':
dca: Error out on missing DSYNC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 11:48:16 +0000 (13:48 +0200)]
Merge commit '
c82da343e635663605bd81c59d872bee3182da73'
* commit '
c82da343e635663605bd81c59d872bee3182da73':
pcm: always use codec->id instead of codec_id
This is not merged as we consistently use codec_id, while libav against what
the comit message might hint at mixes both in the decoder.
Its fine to use either but it should be consistent.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 11:40:12 +0000 (13:40 +0200)]
Merge commit '
c0d973c41b4568d5bad1295879e35cfa611bdcf2'
* commit '
c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See:
68dfe530e0fb03b4d21dfe37f8a572b95c68485e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 11:25:28 +0000 (13:25 +0200)]
Merge commit '
e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
* commit '
e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
mlpdec: Do not set invalid context in read_restart_header
Conflicts:
libavcodec/mlpdec.c
See:
a9cd12ee2afb3f3aad783c396816b23d8513f472
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)]
Merge commit '
2b379a925162b6783bd9a81dc03e647e8b65494c'
* commit '
2b379a925162b6783bd9a81dc03e647e8b65494c':
mlpdsp: x86: Respect cpuflags
Conflicts:
libavcodec/x86/mlpdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 10:57:17 +0000 (12:57 +0200)]
Merge commit '
3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'
* commit '
3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
pcx: Do not overread source buffer in pcx_rle_decode
Conflicts:
libavcodec/pcx.c
See:
8cd1c0febe88b757e915e9af15559575c21ca728
Bytestream based system is left in place and not switched to buf+end, such switch would be
a step backward
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 10:36:04 +0000 (12:36 +0200)]
Merge commit '
170fb593c617cd797d00cf05bfb8d8c21d612893'
* commit '
170fb593c617cd797d00cf05bfb8d8c21d612893':
pcx: K&R formatting cosmetics
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 12 Jul 2013 09:59:45 +0000 (11:59 +0200)]
Merge commit '
ef5b70affc6376bfeadd1ff649b79bad9a124fa8'
* commit '
ef5b70affc6376bfeadd1ff649b79bad9a124fa8':
configure: Check for support for labels in the inline assembly
The timer code is not placed under ifdef as ours does not use labels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 9 Jul 2013 15:57:49 +0000 (17:57 +0200)]
vf_interlace: better handling of odd video size
Signed-off-by: Martin Storsjö <martin@martin.st>
Sean McGovern [Wed, 10 Jul 2013 17:37:05 +0000 (13:37 -0400)]
fate: use current syntax for the scale filter
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Wed, 10 Jul 2013 17:00:15 +0000 (19:00 +0200)]
dca: Respect the current limits in the downmixing capabilities
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 10 Jul 2013 16:07:45 +0000 (18:07 +0200)]
dca: Error out on missing DSYNC
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 10 Jul 2013 02:54:49 +0000 (04:54 +0200)]
pcm: always use codec->id instead of codec_id
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 10 Jul 2013 18:27:03 +0000 (20:27 +0200)]
vdpau: use the correct namespace for the union
Vdp is used by libvdpau, use AVVDPAU as used for the rest.
Reported-by: Alexis Ballier <aballier@gentoo.org>
Luca Barbato [Wed, 10 Jul 2013 02:35:34 +0000 (04:35 +0200)]
mlpdec: Do not set invalid context in read_restart_header
The faulty values rippled further down the codepath causing a
hard-to-track segfault in the assembly code.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 10 Jul 2013 01:18:14 +0000 (03:18 +0200)]
mlpdsp: x86: Respect cpuflags
Luca Barbato [Sat, 29 Jun 2013 04:37:32 +0000 (06:37 +0200)]
pcx: Do not overread source buffer in pcx_rle_decode
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 29 Jun 2013 04:25:31 +0000 (06:25 +0200)]
pcx: K&R formatting cosmetics
Piotr Bandurski [Wed, 10 Jul 2013 15:14:48 +0000 (17:14 +0200)]
rmdec: fix crash in case of oom
Fixes ticket #2724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thierry Foucu [Thu, 11 Jul 2013 21:37:59 +0000 (14:37 -0700)]
libavformat/mov.c: Skipped duplicated MOOV atom
This should fix ticket 1378
If we have parsed a moov atom, and found another one, just skip it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 11 Jul 2013 21:05:53 +0000 (23:05 +0200)]
Supply a User-Agent header when opening rtsp streams.
Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.
Fixes ticket #2761.
Reported, analyzed and tested by trac user imavra.
Dan Flett [Thu, 11 Jul 2013 16:16:07 +0000 (18:16 +0200)]
lavd/fbdev.c: Support RGB565 input colour space.
Tested on a Raspberry Pi.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Martin Storsjö [Tue, 9 Jul 2013 17:51:00 +0000 (20:51 +0300)]
configure: Check for support for labels in the inline assembly
Use this for enabling the ppc timer.h implementation only on
assemblers that support labels in the inline assembly.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 11 Jul 2013 14:28:55 +0000 (16:28 +0200)]
mjpegdec: print length too in APPx debug code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 14:10:18 +0000 (16:10 +0200)]
avcodec/jpeglsdec: support xfrm 1-3
Fixes 75% of Ticket893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 14:08:49 +0000 (16:08 +0200)]
mjpegdec: parse app-xfrm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 14:07:00 +0000 (16:07 +0200)]
mjpegdec: parse app-colr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 09:50:10 +0000 (11:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 09:41:26 +0000 (11:41 +0200)]
Merge commit '
f5c48f5adaead5259660d4eaab2e695d1bac3a08'
* commit '
f5c48f5adaead5259660d4eaab2e695d1bac3a08':
wmavoice: use init_static_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 09:33:10 +0000 (11:33 +0200)]
Merge commit '
04e9853a210e07b1a150aa2b8e9af0aa3601ff21'
* commit '
04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
wmavoice: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 09:29:51 +0000 (11:29 +0200)]
Merge commit '
7d65e960c72f36b73ae7fe84f8e427d758e61da9'
* commit '
7d65e960c72f36b73ae7fe84f8e427d758e61da9':
iff: Do not read over the source buffer
Conflicts:
libavcodec/iff.c
See:
2fbb37b51bbea891392ad357baf8f3dff00bac05
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 09:12:48 +0000 (11:12 +0200)]
Merge commit '
3865ba7b21aef5d60183719e238361ec8797ab5a'
* commit '
3865ba7b21aef5d60183719e238361ec8797ab5a':
iff: K&R formatting cosmetics
Conflicts:
libavcodec/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 00:30:56 +0000 (02:30 +0200)]
mjpegdec: Fix used quant index for gbr
Fixes Ticket1651
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 11 Jul 2013 00:29:46 +0000 (02:29 +0200)]
mjpegdec: initialize source variables before gbr remap
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 5 Jul 2013 12:33:33 +0000 (14:33 +0200)]
lavf/segment: use AV_OPT_TIME_DURATION for time_delta
Simplify.
Stefano Sabatini [Fri, 5 Jul 2013 12:31:29 +0000 (14:31 +0200)]
lavf/segment: reindent after last commit
Stefano Sabatini [Fri, 5 Jul 2013 12:28:38 +0000 (14:28 +0200)]
lavf/segment: add initial_offset option
Should address trac ticket #2224.
Stefano Sabatini [Sat, 6 Jul 2013 08:27:19 +0000 (10:27 +0200)]
doc/formats: add section describing stream specifiers
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
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>
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>
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>
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>
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>
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>
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>
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>
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.
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.
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>
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>
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>
Luca Barbato [Sat, 29 Jun 2013 03:29:54 +0000 (05:29 +0200)]
wmavoice: conceal clearly corrupted blocks
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 29 Jun 2013 01:10:59 +0000 (03:10 +0200)]
wmavoice: use init_static_data
Luca Barbato [Sat, 29 Jun 2013 01:02:02 +0000 (03:02 +0200)]
wmavoice: return meaningful error codes
Luca Barbato [Sat, 29 Jun 2013 05:26:48 +0000 (07:26 +0200)]
iff: Do not read over the source buffer
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 29 Jun 2013 05:05:54 +0000 (07:05 +0200)]
iff: K&R formatting cosmetics
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>