Michael Niedermayer
54bbb90568
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893':
pcx: K&R formatting cosmetics
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
Michael Niedermayer
bec509db43
vf_interlace: better handling of odd video size
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Sean McGovern
52ea298670
fate: use current syntax for the scale filter
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
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
12 years ago
Luca Barbato
f261e50845
dca: Error out on missing DSYNC
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years ago
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
12 years ago
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>
12 years ago
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
12 years ago
Luca Barbato
2b379a9251
mlpdsp: x86: Respect cpuflags
12 years ago
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
12 years ago
Luca Barbato
170fb593c6
pcx: K&R formatting cosmetics
12 years ago
Piotr Bandurski
161047f010
rmdec: fix crash in case of oom
Fixes ticket #2724
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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.
12 years ago
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>
12 years ago
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>
12 years ago
Michael Niedermayer
0ef40446a8
mjpegdec: print length too in APPx debug code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8024b4880c
avcodec/jpeglsdec: support xfrm 1-3
Fixes 75% of Ticket893
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
96747e6cbe
mjpegdec: parse app-xfrm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7afa68d37d
mjpegdec: parse app-colr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
531f016944
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmavoice: conceal clearly corrupted blocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
45cc62f0a0
Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'
* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
wmavoice: use init_static_data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
5698f6bd73
Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21'
* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
wmavoice: return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
Michael Niedermayer
56090b5b80
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
iff: K&R formatting cosmetics
Conflicts:
libavcodec/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
15cee5e562
mjpegdec: Fix used quant index for gbr
Fixes Ticket1651
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
94e86ae15a
mjpegdec: initialize source variables before gbr remap
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
71a2e5245c
lavf/segment: use AV_OPT_TIME_DURATION for time_delta
Simplify.
12 years ago
Stefano Sabatini
459dc81a64
lavf/segment: reindent after last commit
12 years ago
Stefano Sabatini
19ea08a11a
lavf/segment: add initial_offset option
Should address trac ticket #2224 .
12 years ago
Stefano Sabatini
b3ac8a2a60
doc/formats: add section describing stream specifiers
12 years ago
Stefano Sabatini
e7a6962e76
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
12 years ago
Paul B Mahol
db4e191d88
lavfi/aevalsrc: do not free AVOption variables in uninit()
The generic code frees them already.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
badbd2414d
lavfi/aevalsrc: use AV_OPT_TYPE_DURATION
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
1e89f74902
lavfi/afade: use av_rescale()
Should not make a difference, but its good idea.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Derek Buitenhuis
2ea60971dc
fate: Always enable avresample
There's no reason we shouldn't be testing it.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years ago
Paul B Mahol
4511973901
wmalosslessdec: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
07206deed1
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>
12 years ago
Michael Niedermayer
0a3a0edd52
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>
12 years ago
Michael Niedermayer
8f09957194
avcodec/qdm2: initialize sign_bits
Fixes non deterministic output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Carl Eugen Hoyos
1db88c33f2
Suggest recompilation with openssl or gnutls if the https protocol is not found.
Fixes ticket #2765 .
12 years ago
Carl Eugen Hoyos
c9eb5c9751
lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.
12 years ago
Michael Niedermayer
fbe159e850
avcodec/qdm2: store bits in an integer instead of float variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Piotr Bandurski
b050956334
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>
12 years ago
Michael Niedermayer
2e6338b472
Merge remote-tracking branch 'qatar/master'
* qatar/master:
qdm2: Conceal broken samples
See: 5ee008e01d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
d14a26edb7
wmavoice: conceal clearly corrupted blocks
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years ago
Luca Barbato
f5c48f5ada
wmavoice: use init_static_data
12 years ago
Luca Barbato
04e9853a21
wmavoice: return meaningful error codes
12 years ago
Luca Barbato
7d65e960c7
iff: Do not read over the source buffer
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years ago