Michael Niedermayer
c2df95978b
Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'
...
* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
atrac3: Replace a silly counter variable name with plain 'j'
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6565b1ad97
avcodec/h264_sei: make SEI type truncated message more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fcd19d6c8d
avcodec/jpeg2000dec: Zero code and quant style
...
This prevents future frames from using half initialized/inconsistent
structures
Fixes assertion failure
Fixes Ticket2897
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1c71f185ad
avcodec/tiff_common: Improve formating of long arrays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
be0b4c70ec
atrac3: Replace a silly counter variable name with plain 'j'
11 years ago
Michael Niedermayer
4d5d905eed
ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e57dba0d52
avcodec: add av_codec_get_max_lowres()
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Marton Balint
0362cf1a19
avfilter/vf_histogram: add mirrored waveform mode
...
Added parameter to mirror the waveform (high values are shown on top in column mode)
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Marton Balint
5b5bb0d81c
avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Michael Niedermayer
4c292d5c34
Merge remote-tracking branch 'rbultje/master'
...
* rbultje/master:
Full-pixel MC functions.
VP9 MC (ssse3) optimizations.
Native VP9 decoder.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5a63fb6693
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c4f3b55f50
Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'
...
* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
vf_interlace: do not process an already interlaced frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Stefano Sabatini
f5b27b6d5f
ffprobe: print stream channel_layout when available
...
Fix trac ticket #3006 .
11 years ago
Ronald S. Bultje
f1548c008f
Full-pixel MC functions.
...
Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.
11 years ago
Ronald S. Bultje
c07ac8d467
VP9 MC (ssse3) optimizations.
...
Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.
11 years ago
Ronald S. Bultje
848826f527
Native VP9 decoder.
...
Authors: Ronald S. Bultje <rsbultje gmail com>,
Clement Boesch <u pkh me>
11 years ago
Carl Eugen Hoyos
b5f219c904
Print pix_fmt name on h264 context reinitialisation.
11 years ago
Michael Niedermayer
64327aabb9
ffmpeg: add support to force specific AVCodecs
...
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5082fcc0e2
avformat: add support to force specific AVCodecs
...
previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f4aec34805
avformat/utils: pass AVFormatContext to find_decoder()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Reimar Döffinger
af6e232ccf
VC1 VDPAU: Mark missing reference frames as such.
...
Currently the code passes some nonsense values as
references instead, causing corruption with NVidia's
and assertion failures with Mesa's implementation.
For non-corrupted input this mostly happens in
interlaced bitstreams, e.g.
http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv .
The != VDP_INVALID handle assert does not trigger
(and probably is quite nonsense) because the frames
are initialized to 0.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
11 years ago
Michael Niedermayer
ebb8dd437b
mov: fix trun / pseudo_stream_id handling
...
This fixes simple concatenated h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
95666b2298
avcodec/imgconvert/get_color_type: fix type for PAL8
...
Fixes Ticket3008
Fate changes as PAL8 gets used instead of BGR8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
2490996f38
avcodec: use designated initializers for bitstream filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Anton Khirnov
451606f7ce
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
11 years ago
Vittorio Giovara
06e7301a2e
vf_interlace: do not process an already interlaced frame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Michael Niedermayer
5e253fdfc1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c28bca2bde
Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
...
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
mxf: Remove a typo
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8aa6ffd8fa
Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'
...
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
asfdec: Check the return value of asf_read_stream_properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
3841e4510b
avfilter/avf_showspectrum: use the name 's' for the pointer to the private context
11 years ago
Paul B Mahol
848a1e6738
avfilter/af_afade: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
0425fd7eb2
ffmpeg: dont return reserved values
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
e31a239fea
avfilter/vf_removelogo: use the name 's' for the pointer to the private context
11 years ago
Paul B Mahol
7d0ce1e59d
avfilter/af_silencedetect: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Maxim Poliakovski
d49f3fa579
atrac3: Generalize gain compensation code
...
Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
4fa2484067
atrac3/decode_gain_control: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
4978be2bc6
atrac3: rename num_gain_data to num_points
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
dc80e250fc
atrac3: Rename GainInfo to AtracGainInfo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
746cb9bc53
atrac: limit line length to 80 chars
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
3d80ab015f
atrac: Move doxygen comments to the header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
cc2330fe3a
atrac: Update copyright info and file description.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
852241561d
atrac: Add missing av_cold.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
286beebdc3
avcodec/wmalosslessdec: check block_align
...
Code copied from wmaprodec
Fixes null pointer dereference
Fixes Ticket3002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ad8fbddb94
Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: Properly set zlib dependencies for all components)
...
The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results
Fixes Ticket2920
This reverts commit c32db6adab
, reversing
changes made to 05f1b4e2ec
.
Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.
11 years ago
Paul B Mahol
edadda968c
avfilter/vf_histogram: change order of histograms for planar rgb
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Marton Balint
cac9af68a4
avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Marton Balint
31a8461d64
avfilter/vf_histogram: improve waveform speed
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Michael Niedermayer
795eaf8d69
avcodec/fraps: increase vlc nb_bits
...
This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Thilo Borgmann
d3a03d90a3
configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004.
...
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
628a17d78a
rtmp: alias rtmp_listen to listen
...
Make it uniform with the other protocols.
11 years ago