Michael Niedermayer
f57119b8e5
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>
2013-07-13 12:44:37 +02:00
Michael Niedermayer
dc072c9867
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
jpeg2000: Initialize only once mqc arrays
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 12:22:22 +02:00
Nicolas Bertrand
f56fe04de3
jpeg2000: Initialize only once mqc arrays
...
Improves decoding speed.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-13 07:54:12 +02:00
Nicolas Bertrand
dd1382ac95
jpeg2000: Initialize only once mqc arrays
...
Increases encoding and decoding speed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 23:43:09 +02:00
Paul B Mahol
7f4a1fddd3
lavf: add missing build dependency for tta demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-12 19:51:48 +00:00
Andrey Utkin
34fd21120d
retry_transfer_wrapper(): check for interrupt before operation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 21:27:27 +02:00
Andrey Utkin
1e85b5e077
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>
2013-07-12 21:27:27 +02:00
Michael Niedermayer
9219ec93b1
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>
2013-07-12 21:27:26 +02:00
Carl Eugen Hoyos
6476967f21
Fix compilation with --disable-everything --enable-demuxer=aac.
2013-07-12 21:27:21 +02:00
Paul B Mahol
b3405b1bda
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>
2013-07-12 15:58:22 +00:00
Michael Niedermayer
8aea97a49d
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>
2013-07-12 17:52:03 +02:00
Paul B Mahol
937cfebd72
lavfi/aevalsrc: remove hard limit on number of channels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-12 15:51:47 +00:00
Michael Niedermayer
86d1a5d80f
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>
2013-07-12 14:58:41 +02:00
Michael Niedermayer
bc82405188
Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'
...
* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
fate: use current syntax for the scale filter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:51:24 +02:00
Michael Niedermayer
cce254373c
Merge commit '3802833bc1f79775a1547c5e427fed6e92b77e53'
...
* commit '3802833bc1f79775a1547c5e427fed6e92b77e53':
dca: Respect the current limits in the downmixing capabilities
Conflicts:
libavcodec/dcadec.c
See: 8e77c3846e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:49:27 +02:00
Michael Niedermayer
107a56c1ed
Merge commit 'f261e508459e28beca59868a878e1519a44bb678'
...
* commit 'f261e508459e28beca59868a878e1519a44bb678':
dca: Error out on missing DSYNC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 14:13:22 +02:00
Michael Niedermayer
73f940e4d9
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>
2013-07-12 14:08:32 +02:00
Michael Niedermayer
0da0caa9a9
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
...
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:47:37 +02:00
Michael Niedermayer
e9348e107b
Merge commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446'
...
* commit 'e9d394f3fad7e8fd8fc80e3b33cb045bbaceb446':
mlpdec: Do not set invalid context in read_restart_header
Conflicts:
libavcodec/mlpdec.c
See: a9cd12ee2a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:28:40 +02:00
Michael Niedermayer
9d47333e3e
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
...
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
mlpdsp: x86: Respect cpuflags
Conflicts:
libavcodec/x86/mlpdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 13:10:53 +02:00
Michael Niedermayer
50617fce07
Merge commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22'
...
* commit '3abde1a3b49cf299f2aae4eaae6b6cb5270bdc22':
pcx: Do not overread source buffer in pcx_rle_decode
Conflicts:
libavcodec/pcx.c
See: 8cd1c0febe
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>
2013-07-12 12:58:13 +02:00
Michael Niedermayer
54bbb90568
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
...
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
pcx: K&R formatting cosmetics
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 12:36:04 +02:00
Michael Niedermayer
c6953589f9
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>
2013-07-12 12:07:14 +02:00
Michael Niedermayer
bec509db43
vf_interlace: better handling of odd video size
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-12 11:40:56 +03:00
Sean McGovern
52ea298670
fate: use current syntax for the scale filter
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-12 11:08:25 +03:00
Luca Barbato
3802833bc1
dca: Respect the current limits in the downmixing capabilities
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
f261e50845
dca: Error out on missing DSYNC
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
c82da343e6
pcm: always use codec->id instead of codec_id
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
c0d973c41b
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>
2013-07-12 04:34:49 +02:00
Luca Barbato
e9d394f3fa
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
2013-07-12 04:34:49 +02:00
Luca Barbato
2b379a9251
mlpdsp: x86: Respect cpuflags
2013-07-12 04:34:49 +02:00
Luca Barbato
3abde1a3b4
pcx: Do not overread source buffer in pcx_rle_decode
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-12 04:34:49 +02:00
Luca Barbato
170fb593c6
pcx: K&R formatting cosmetics
2013-07-12 04:34:49 +02:00
Piotr Bandurski
161047f010
rmdec: fix crash in case of oom
...
Fixes ticket #2724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-12 04:24:35 +02:00
Thierry Foucu
38ce775eea
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>
2013-07-12 02:41:34 +02:00
Carl Eugen Hoyos
0fff7f039c
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.
2013-07-11 23:05:53 +02:00
Dan Flett
43d36599fe
lavd/fbdev.c: Support RGB565 input colour space.
...
Tested on a Raspberry Pi.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-11 18:16:07 +02:00
Martin Storsjö
ef5b70affc
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>
2013-07-11 18:53:02 +03:00
Michael Niedermayer
0ef40446a8
mjpegdec: print length too in APPx debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:28:55 +02:00
Michael Niedermayer
8024b4880c
avcodec/jpeglsdec: support xfrm 1-3
...
Fixes 75% of Ticket893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:10:18 +02:00
Michael Niedermayer
96747e6cbe
mjpegdec: parse app-xfrm
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:08:49 +02:00
Michael Niedermayer
7afa68d37d
mjpegdec: parse app-colr
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 16:08:36 +02:00
Michael Niedermayer
531f016944
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:50:18 +02:00
Michael Niedermayer
45cc62f0a0
Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'
...
* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
wmavoice: use init_static_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:41:34 +02:00
Michael Niedermayer
5698f6bd73
Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21'
...
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
wmavoice: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:33:19 +02:00
Michael Niedermayer
2efc2b53be
Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9'
...
* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
iff: Do not read over the source buffer
Conflicts:
libavcodec/iff.c
See: 2fbb37b51b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:32:36 +02:00
Michael Niedermayer
56090b5b80
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'
...
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
iff: K&R formatting cosmetics
Conflicts:
libavcodec/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 11:12:48 +02:00
Michael Niedermayer
15cee5e562
mjpegdec: Fix used quant index for gbr
...
Fixes Ticket1651
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 02:31:58 +02:00
Michael Niedermayer
94e86ae15a
mjpegdec: initialize source variables before gbr remap
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-11 02:31:58 +02:00
Stefano Sabatini
71a2e5245c
lavf/segment: use AV_OPT_TIME_DURATION for time_delta
...
Simplify.
2013-07-11 00:36:53 +02:00