Mikulas Patocka
074155360d
avcodec/x86/hpeldsp: fix crash on AMD K6-3+
...
There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.
livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.
As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.
This bug seems to be introduced by commit
71155d7b41
2013-11-03 19:49:11 +01:00
Stefano Sabatini
535d58959d
ffmpeg: add verbose consistency checks in case of filtering inconsistent options
...
In particular, warn in case -filter and streamcopy is used at the same
time, fix trac ticket #678 .
2013-11-03 18:05:43 +01:00
Stefano Sabatini
cfe7185a92
lavc: remove dead FF_API_OLD_TIMECODE API
2013-11-03 17:58:44 +01:00
Stefano Sabatini
a689560428
lavc: remove dead FF_API_AVCODEC_OPEN API
2013-11-03 17:58:44 +01:00
Stefano Sabatini
d3397c3e82
lavc: remove dead FF_API_ALLOC_CONTEXT API
2013-11-03 17:58:44 +01:00
Paul B Mahol
3d9fc5c6ad
avfilter/vf_aspect: remove dupe constants setup
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-03 16:39:22 +00:00
Michael Niedermayer
73e7d8f5f0
MAINTAINERS: add vp9 maintainers
...
Suggested-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 14:45:18 +01:00
Michael Niedermayer
2ed562d5fa
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/af_pan: support unknown layouts on input.
lavfi/af_pan: support unknown layouts on output.
lswr: fix assert failure on unknown layouts.
lavfi: parsing helper for unknown channel layouts.
lavfi/avfiltergraph: do not reduce incompatible lists.
lavfi/avfiltergraph: suggest a solution when format selection fails.
lavd/lavfi: support unknown channel layouts.
lavf/wavenc: check for a single stream.
lavd/alsa: add stream validation
lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 13:57:05 +01:00
Michael Niedermayer
91a6975761
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmpproto: Reorder conditions to help dead code elimination
See: 23e9e5c7d9
2013-11-03 13:38:33 +01:00
Stefano Sabatini
90c329cc25
lavc/version.h: remove empty line
2013-11-03 13:13:24 +01:00
Stefano Sabatini
5a6e6dcaa4
lavc: drop deprecated audio_convert API at the next major bump
...
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-11-03 13:13:24 +01:00
Michael Niedermayer
cf49d5907a
avcodec/ansi: set w/h correctly at the top
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 13:00:10 +01:00
Michael Niedermayer
b568eeba75
Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
...
* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
ansi: fix possible use of uninitialized variables
Conflicts:
libavcodec/ansi.c
Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 12:58:54 +01:00
Michael Niedermayer
b6413cdc02
Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'
...
* commit 'c0bba95c2363641d3297b3852b2ece1474cda295':
wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 12:48:28 +01:00
Michael Niedermayer
08e7644b68
Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'
...
* commit '5858a67f135a7395c548482c73cf3d39bcdd3022':
attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 12:38:13 +01:00
Michael Niedermayer
7edc9240a8
Merge commit '3a14b160bd442794c6a16a6a883adb547550e847'
...
* commit '3a14b160bd442794c6a16a6a883adb547550e847':
vf_scale: make the dar variable return the DAR.
Conflicts:
Changelog
doc/filters.texi
libavfilter/version.h
See: 61d55fda2b
2013-11-03 12:31:21 +01:00
Michael Niedermayer
a75bf4e5c1
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
...
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
vf_aspect: support variables in evaluating the aspect ratios
Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 11:54:19 +01:00
Vittorio Giovara
d763978583
rtmpproto: Reorder conditions to help dead code elimination
...
This makes sure that these branches are eliminated properly
with clang with optimizations disabled.
2013-11-03 11:51:41 +01:00
Vittorio Giovara
3ea5f64fff
ansi: fix possible use of uninitialized variables
2013-11-03 11:51:40 +01:00
Vittorio Giovara
c0bba95c23
wtv: fix variable sign in format
2013-11-03 11:51:40 +01:00
Vittorio Giovara
5858a67f13
attributes: disable flatten on llvm/clang
2013-11-03 11:51:40 +01:00
Nicolas George
7b0a587393
lavfi/af_pan: support unknown layouts on input.
...
Fix trac ticket #2899 .
2013-11-03 10:30:50 +01:00
Nicolas George
4e9adc9b73
lavfi/af_pan: support unknown layouts on output.
2013-11-03 10:30:47 +01:00
Nicolas George
4a640a6ac8
lswr: fix assert failure on unknown layouts.
2013-11-03 10:30:37 +01:00
Nicolas George
6e2473edfd
lavfi: parsing helper for unknown channel layouts.
...
Make ff_parse_channel_layout() accept unknown layouts too.
2013-11-03 10:30:25 +01:00
Nicolas George
d300f5f6f5
lavfi/avfiltergraph: do not reduce incompatible lists.
...
A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
2013-11-03 10:30:16 +01:00
Nicolas George
f775eb3fb4
lavfi/avfiltergraph: suggest a solution when format selection fails.
...
Format selection can fail if unknown channel layouts are used
with filters that do not support it.
2013-11-03 10:30:08 +01:00
Nicolas George
863fb11f63
lavd/lavfi: support unknown channel layouts.
2013-11-03 10:29:53 +01:00
Nicolas George
eeb975f5cd
lavf/wavenc: check for a single stream.
...
Fix trac ticket #3110 .
2013-11-03 10:29:27 +01:00
Lukasz Marek
e56d1a1203
lavd/alsa: add stream validation
...
Don't trust provided streams.
Return with error when stream count is not 1 or
provided stream is not an audio stream.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-11-03 10:28:15 +01:00
Lukasz Marek
6ac9afd16e
lavd/alsa: fix timestamp calculation
...
Current implementation didn't include duration of
last processed packet.
Device may return negative timestamps without
this correction.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-11-03 10:28:15 +01:00
Michael Niedermayer
8a701ef7dd
avcodec/hevc_sei: Fix null dereference in decode_pic_timing()
...
Fixes Ticket3106
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 02:19:28 +01:00
Michael Niedermayer
63a37d0e1e
avcodec/hevc_sei: check active_seq_parameter_set_id validity
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 02:13:55 +01:00
Michael Niedermayer
6e87dfb589
mpegvideo: reduce whitespace differences to libav
...
This excludes many changes that worsen readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 01:24:01 +01:00
Michael Niedermayer
4fb1221e66
h264: reduce whitespace differences to libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 01:16:31 +01:00
James Zern
23c03ac91e
libvpxenc: allow qmax of 0
...
this is valid for both vp8 & vp9 and necessary for lossless in the
latter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 01:00:16 +01:00
Timothy Gu
50f52a5498
avutil/xtea: add Doxy @file and group
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 00:59:38 +01:00
Timothy Gu
624672fcce
avutil/adler32: add Doxy group
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 00:58:31 +01:00
James Zern
517afd72c6
libvpxenc: add VP9 options
...
same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 00:35:15 +01:00
James Zern
e87043bb1f
MAINTAINERS: add myself for libvpx*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 00:34:04 +01:00
Michael Niedermayer
1fb3b494fa
ffv1enc: store 2pass statistics at the end
...
This reduces their size from O(n) to O(1)
Fixes Ticket3078
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 22:52:52 +01:00
Michael Niedermayer
8d88ed9a1f
avcodec/ffv1enc: pass through pts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 22:52:52 +01:00
Rudolf Polzer
3a14b160bd
vf_scale: make the dar variable return the DAR.
...
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8
vf_aspect: support variables in evaluating the aspect ratios
...
Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:14:08 +01:00
James Zern
a8bcc956fd
libvpxenc: split vp8/vp9 options array
...
the current options are left for both to provide command line compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 20:35:12 +01:00
Timothy Gu
d3211cfaed
avcodec/libmp3lame: add ABR support
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:44:20 +01:00
Michael Niedermayer
67d1d06225
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
os_support: Add #endif comments for better readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:37:21 +01:00
Michael Niedermayer
1654e64bba
Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58'
...
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
mpeg4video_parser: K&R formatting cosmetics
Conflicts:
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:31:41 +01:00
Michael Niedermayer
a805e2e653
avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:24:24 +01:00
Michael Niedermayer
35594c48ca
libavcodec/hevc: random cosmetics to reduce diff to 064698d381
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 17:28:44 +01:00
