810eb285e3
Merge commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab'
* commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab':
proresenc: Reuse proper dsputil infrastructure for FDCT
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
2e88f82a8a
Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'
* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311':
prores: Drop DSP infrastructure for prores encoder bits
Conflicts:
libavcodec/Makefile
libavcodec/proresdsp.c
libavcodec/proresenc_kostya.c
Note, these changes only affect one of the 2 prores encoders we have
If someone wants to add optimizations to the affected encoder, or needs/wants
this infrastructure, then iam happy to revert this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
18d870da83
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
proresenc: Drop unnecessary DCT permutation bits
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
5ba1648318
Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'
* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e':
prores: Use consistent names for DSP arch initialization functions
Conflicts:
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
f3eef02746
avcodec/msvideo1: Fix palette in case of seek before decode
Fixes Ticket3212
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a55546f48d
proresenc: Reuse proper dsputil infrastructure for FDCT
12 years ago
92e598a57a
prores: Drop DSP infrastructure for prores encoder bits
None of the encoder bits are arch-optimized.
12 years ago
d6acefe058
proresenc: Drop unnecessary DCT permutation bits
No permutation is necessary for the FDCT.
12 years ago
b23650491f
prores: Use consistent names for DSP arch initialization functions
12 years ago
669043db81
Merge remote-tracking branch 'cus/stable'
* cus/stable:
lavfi/frei0r: factorize plugin loading with static path
lavfi/frei0r: search plugins in lib64 dirs on all architectures
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
e8e91a32e5
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: fix seek to nagative position
lavf/libssh: fix seek to nagative position
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
5c634cbeb7
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Give IDCT matrix transpose macro a more descriptive name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9f4b55ef49
lavf/ftp: fix seek to nagative position
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
12 years ago
0025f13005
lavf/libssh: fix seek to nagative position
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
12 years ago
2163a40a46
x86/imdct36: use sse3 instructions in the last BUTTERF step when possible
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
fbf98375e4
x86/imdct36: don't build imdct36_float_sse on x86_64 targets
There's an SSE2 version as well, and x86_64 guarantees that
instruction set is present.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
f2408ec9d7
Give IDCT matrix transpose macro a more descriptive name
This also avoids a macro name clash and related warning on ARM.
12 years ago
a05635ee01
avcodec/mjpegdec: convert CMYK to GBRAP
Fixes Ticket2799
This should be moved into swscale once we have a CMYK pixel format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
501beae6f9
avcodec/mjpegdec: fix decoding 4th plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6904168c79
avcodec/mjpegdec: Print error in case of CMYK
Also fail if AV_EF_EXPLODE is set.
We do not fail by default, but rather return some image as it may be usefull to the
end user to see what is on the image, for example text could be read quite fine and
objects recognized.
Possibly fixes Ticket3424
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
681e72a668
avcodec/mjpegdec: parse adobe_transform
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
7e8be7081f
avcodec/mjpegdec: Print human readable string for APPx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
3ba056017f
Fix http authentication.
Add parenthesis around "MD5" in the request string as required by
RFC 2069.
Fixes ticket #3417 .
Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie
12 years ago
4f4cc43fd8
avcodec/h264: allow mixing idr and non idr slices with frame threading again
This combination exists in the wild
Fixes Ticket3131
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
622d24e4eb
avformat/mov: simplify code setting needs_parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
649686d89b
avcodec/h264_refs: remove lost frames instead of disfavoring them
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
33a2b45c2e
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_compand: add a dependency on strtok_r
Conflicts:
configure
Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
64bb64f704
avcodec/h264: fix droped frame handling also for threads > 1
Seems i mistakely tested just with threads=1
Fixes part of Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b5005def8a
avcodec/h264: avoid using lost frames as references
Fixes Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
ead0dd3cf6
lavfi/frei0r: factorize plugin loading with static path
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
35ead1f281
lavfi/frei0r: search plugins in lib64 dirs on all architectures
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
12 years ago
c4c5351f08
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
291e49d4e7
af_compand: add a dependency on strtok_r
12 years ago
a63ac1106d
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
These are already covered through dependencies specified in configure.
12 years ago
1524b0fa68
libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
baa650cc79
configure: use pkg-config to detect libbluray
The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
bdadf05ec8
avcodec/parser: put lost comments back
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9d297641ee
avformat/sdr2: h264 stream needs parsing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
9f2a3bcee7
avfilter: remove superflous lines
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
a2e4b4e968
avfilter/af_compand: some more cosmetics to decrease difference with qatar
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
8f946ac8ea
avfilter: remove af_compand_fork
All relevant changes except the float/double one have been merged
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
c62d83a5e7
avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
05412f4cd4
avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
5e02ff3e3d
avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
619d6b8f55
avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
e509df4bc8
avfilter/af_compand: error checks from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
4b87975147
avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
5c78fe08b0
avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
66ad3292eb
avfilter/af_compand: add Andrew Kelley to the copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
86a191e25b
avfilter/af_compand: merge avframe code from af_compand_fork
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
Diego Biurrun
Lukasz Marek
James Almer
Carl Eugen Hoyos
Marton Balint
Anton Khirnov
Peter Ross
Timothy Gu
Paul B Mahol