Diego Biurrun
80fefbed62
x86: cpu: Restore some explanatory comments removed in 7160bb7
2013-10-03 23:00:09 +02:00
Maxim Poliakovski
6a5bfd4d49
atrac: Add missing av_cold
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 23:00:09 +02:00
Michael Niedermayer
c7fe2a3733
ffplay: avoid direct access to lowres use av_codec_g/set_lowres()
...
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 22:38:54 +02:00
Michael Niedermayer
b72040daad
ffplay: avoid direct access to max_lowres use av_codec_get_max_lowres()
...
This avoids future ABI issues when the field is moved to the end of the
struct.
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 22:38:23 +02:00
Maxim Poliakovski
79cbac8cd4
atrac3: Generalize gain compensation code
...
Move it to the ATRAC common code, to reuse in the upcoming ATRAC3+ decoder.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 18:20:01 +02:00
Diego Biurrun
5ce04c14dd
Use correct Doxygen syntax
2013-10-03 17:53:51 +02:00
Maxim Poliakovski
4be292dac7
atrac: Move doxygen comments to the header
...
Also update copyright info and file description.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03 17:53:51 +02:00
Diego Biurrun
be0b4c70ec
atrac3: Replace a silly counter variable name with plain 'j'
2013-10-03 17:53:51 +02:00
Paul B Mahol
5f99e6d632
avfilter/vf_pullup: do not ignore frame field order
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-03 02:43:20 +00:00
Michael Niedermayer
4a63c69faa
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
atrac3: Generalize gain compensation code
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:46:42 +02:00
Michael Niedermayer
2ece7d94bc
Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'
...
* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
Use correct Doxygen syntax
Conflicts:
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:29:38 +02:00
Michael Niedermayer
16bb8faac6
Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'
...
* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
atrac: Move doxygen comments to the header
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 21:22:55 +02:00
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>
2013-10-03 21:14:54 +02:00
Michael Niedermayer
6565b1ad97
avcodec/h264_sei: make SEI type truncated message more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 20:13:55 +02:00
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>
2013-10-03 19:03:56 +02:00
Michael Niedermayer
1c71f185ad
avcodec/tiff_common: Improve formating of long arrays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 18:47:50 +02:00
Michael Niedermayer
4d5d905eed
ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 17:20:53 +02:00
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>
2013-10-03 16:33:09 +02:00
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>
2013-10-02 21:02:59 +00:00
Marton Balint
5b5bb0d81c
avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2013-10-02 21:02:54 +00:00
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>
2013-10-03 13:56:52 +02:00
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>
2013-10-03 12:04:37 +02:00
Michael Niedermayer
c4f3b55f50
Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'
...
* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
vf_interlace: do not process an already interlaced frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 11:16:57 +02:00
Stefano Sabatini
f5b27b6d5f
ffprobe: print stream channel_layout when available
...
Fix trac ticket #3006 .
2013-10-03 09:19:38 +02:00
Ronald S. Bultje
f1548c008f
Full-pixel MC functions.
...
Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.
2013-10-02 21:03:15 -04:00
Ronald S. Bultje
c07ac8d467
VP9 MC (ssse3) optimizations.
...
Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.
2013-10-02 21:03:15 -04:00
Ronald S. Bultje
848826f527
Native VP9 decoder.
...
Authors: Ronald S. Bultje <rsbultje gmail com>,
Clement Boesch <u pkh me>
2013-10-02 21:03:11 -04:00
Carl Eugen Hoyos
b5f219c904
Print pix_fmt name on h264 context reinitialisation.
2013-10-03 01:42:23 +02:00
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>
2013-10-02 22:56:03 +02:00
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>
2013-10-02 22:56:03 +02:00
Michael Niedermayer
f4aec34805
avformat/utils: pass AVFormatContext to find_decoder()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 22:56:03 +02:00
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>
2013-10-02 20:51:14 +02:00
Michael Niedermayer
ebb8dd437b
mov: fix trun / pseudo_stream_id handling
...
This fixes simple concatenated h264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 19:59:10 +02:00
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>
2013-10-02 19:59:10 +02:00
Paul B Mahol
2490996f38
avcodec: use designated initializers for bitstream filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-02 17:20:29 +00:00
Anton Khirnov
451606f7ce
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
2013-10-02 16:41:08 +02:00
Vittorio Giovara
06e7301a2e
vf_interlace: do not process an already interlaced frame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-02 16:40:49 +02:00
Michael Niedermayer
5e253fdfc1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 14:59:42 +02:00
Michael Niedermayer
c28bca2bde
Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
...
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
mxf: Remove a typo
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 14:55:18 +02:00
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>
2013-10-02 14:53:00 +02:00
Clément Bœsch
3841e4510b
avfilter/avf_showspectrum: use the name 's' for the pointer to the private context
2013-10-02 11:37:53 +00:00
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>
2013-10-02 11:37:52 +00:00
Michael Niedermayer
0425fd7eb2
ffmpeg: dont return reserved values
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 12:59:39 +02:00
Clément Bœsch
e31a239fea
avfilter/vf_removelogo: use the name 's' for the pointer to the private context
2013-10-02 10:54:11 +00:00
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>
2013-10-02 10:28:28 +00:00
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>
2013-10-02 10:44:02 +02:00
Maxim Poliakovski
4fa2484067
atrac3/decode_gain_control: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:42:12 +02:00
Maxim Poliakovski
4978be2bc6
atrac3: rename num_gain_data to num_points
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:37:38 +02:00
Maxim Poliakovski
dc80e250fc
atrac3: Rename GainInfo to AtracGainInfo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:37:05 +02:00
Maxim Poliakovski
746cb9bc53
atrac: limit line length to 80 chars
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-02 10:21:35 +02:00