Michael Niedermayer
5c65aed7fd
Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
...
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase
Conflicts:
libavcodec/x86/mpegvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cf8c44fc47
Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'
...
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
webpdec: Fix decoding of the huffman group indices.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b28fcbba0c
Merge commit '9279826008b80daad7446950a821f32033ccd33f'
...
* commit '9279826008b80daad7446950a821f32033ccd33f':
id3v2enc: use a case-insensitive comparison for APIC picture type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Oliver Fromme
d73823286d
avcodec/dvdsubdec: fix alpha in debuging code
...
improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Oliver Fromme
3f0a3e9e12
avcodec/dvdsubdec: Fix off-by-one error
...
Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
391ecc961c
x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase
11 years ago
Michael Niedermayer
a9ce5d92e6
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
...
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
daud: split muxer and demuxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Justin Ruggles
c6698dfe7c
webpdec: Fix decoding of the huffman group indices.
...
Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."
11 years ago
Michael Niedermayer
524eeaca22
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'
...
* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
ismindex: Add an option for outputting files elsewhere than in the current directory
Conflicts:
tools/ismindex.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
9279826008
id3v2enc: use a case-insensitive comparison for APIC picture type
11 years ago
Michael Niedermayer
0d35d5ab1b
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
...
* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
ismindex: Allow adding a path prefix to the generated .ism file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Nidhi Makhijani
0955e57ad0
daud: split muxer and demuxer
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years ago
Martin Storsjö
f920d08953
ismindex: Add an option for outputting files elsewhere than in the current directory
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Martin Storsjö
6bc4934b75
ismindex: Allow adding a path prefix to the generated .ism file
...
This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Carl Eugen Hoyos
d538dd824e
avformat: Add image3 demuxers with format autodetection
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Zern
dea377fcc0
ivfenc: support VP9
...
libvpx tools accept vp9 ivf files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Leandro Santiago
4582e1162a
avfilter/vf_drawtext: fix resource leak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a3c479fc49
avformat/avformat: minor grammar improvement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
44f079b27e
Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'
...
* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
lavf: document av_dump_format()
Conflicts:
libavformat/avformat.h
See: 61f96be08a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
982920cfaa
Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'
...
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
hevc: Use the local context variable when needed
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
33f6ba9c4e
avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
b52c26c66f
avfilter: add flanger filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
7e8c1f0c38
avfilter/af_aphaser: move wave table generation code into separate file
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Vittorio Giovara
cdab9db2ad
lavf: document av_dump_format()
11 years ago
Luca Barbato
df949b645b
hevc: Use the local context variable when needed
11 years ago
Michael Niedermayer
1265247206
avfilter/vf_format: Check pix_fmts before dereferencing it
...
Fixes CID1224286
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5ab67340f9
avfilter/avfiltergraph: dont "or" together error codes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
b02cfad7d2
Fix standalone compilation of the wtv muxer.
11 years ago
Michael Niedermayer
ce6a1ff2a1
avcodec/on2avc: Fix out of array access
...
Fixes CID1206648
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
61815ef85b
Merge commit '98569d89638efc325042bd0081e9a02181afdafa'
...
* commit '98569d89638efc325042bd0081e9a02181afdafa':
matroskadec: Fix a double negation typo
See: 2c5b92fe90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anshul Maheshwari
43d70a776d
avcodec: Updated comment for sub param
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anshul Maheshwari
7d1898ebcc
avcodec/dvbsubdec: removed unnecessary null check for subtitle
...
In refrence to coverity defect 1224278
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
98569d8963
matroskadec: Fix a double negation typo
...
This typo has existed since this code was added in c16582579
.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Stefano Sabatini
462c9ee3ac
lavfi/overlay: show incoming frames on debug messages
...
This is especially useful to debug queue overflow issues.
Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years ago
Michael Niedermayer
5307fa00a4
avcodec/dvdec: remove redundant null check
...
Fixes CID700682 again
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d266ecff4b
avcodec/bitstream: remove trivial assert
...
Fixed CID1224273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
b5f0eac068
swr: rename swresample_dsp init functions to swri_resample_dsp
...
The swresample_ prefix is not for internal functions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Dave Rice
1619a0e2b8
doc/filters: fix typo
...
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4930cd13d6
ffmpeg: check av_opt_set_dict() return
...
Fixes CID1224275
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Dave Rice
79d3eeb2b7
doc/ffprobe.xsd: fix order and missing elements/attributes
...
Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
42a92a240d
swr: remove obsolete resample prototypes
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
23a9edf531
Partially revert "swr: add prototypes for resample dsp functions"
...
Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c
The DO_RESAMPLE_ONE macro is removed for that same reason as well.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
c45b7f0d80
x86/swr: add ff_resample_{common, linear}_int16_xop
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
1a69224f44
x86/swr: add ff_resample_{common, linear}_float_fma
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
a441a2437b
x86: rename dsputil.asm to idctdsp.asm
...
Its only function is no longer part of dsputil.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ef7e8425e8
avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
784e1cf76b
avcodec/mjpegdec: handle luma upscale detection generically
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
64d98dadc7
avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list
...
Some code is left to handle corner cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7558e55345
avcodec/mjpegdec: Support pix_fmt_id==0x11222200
...
Fixes: 4858286_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cd417d947e
avcodec/mjpegdec: fix width for non chroma in rescaling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago