Michael Niedermayer
26dad980ba
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
...
* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
doc: name correct header
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6b06f9f1bc
Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
...
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fc10ed2cac
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
...
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
70a25587d2
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
...
* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
avconv: remove a write-only variable
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e66247e926
Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'
...
* commit '8aca00cc2b25810bdd85b75f5632844a5614b707':
libx265: Properly handled dynamic linking with MSVC
See: 87769d6c8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e1991c7d5f
Merge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b'
...
* commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b':
libx265: Support SAR
See: 73ee4cf307
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3d53bbd0ac
Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'
...
* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
libx265: Support 4:4:4
See: d102925a6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a88cbdfb90
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
...
* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
libx265: Update API usage
Conflicts:
libavcodec/libx265.c
See: d373647194
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a908de7f49
avformat/options_table: add named constants for avoid_negative_ts
...
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Vittorio Giovara
48d1ed9c83
doc: name correct header
11 years ago
Anton Khirnov
39c2880eea
af_volume: preserve frame properties
11 years ago
Anton Khirnov
dcc7e4bf1d
af_resample: preserve frame properties
11 years ago
Anton Khirnov
67f2a68814
avconv: remove a write-only variable
11 years ago
Derek Buitenhuis
6d18154f61
libx265: Use proper error code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
87769d6c8f
libx265: Properly handled dynamic linking with MSVC
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
73ee4cf307
libx265: Support SAR
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
d102925a6d
libx265: Support 4:4:4
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
d373647194
libx265: Update API usage
...
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
8aca00cc2b
libx265: Properly handled dynamic linking with MSVC
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
0f7fa48cf1
libx265: Support SAR
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
2142b2efcd
libx265: Support 4:4:4
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
d00a504b24
libx265: Update API usage
...
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Michael Niedermayer
2a3cb1cfca
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7a9946d386
Merge commit '8feac29cc46270cc89d6016340e7bac780877131'
...
* commit '8feac29cc46270cc89d6016340e7bac780877131':
lavc: use AVFrame API properly in ff_reget_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
74bb1ca82c
avutil/frame_copy_audio: also check that channels match
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fff5262301
Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'
...
* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
frame: add a convenience function for copying AVFrame data
Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cc6cc84bc4
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
...
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
avconv: support forcing codec tags for input streams
Conflicts:
doc/ffmpeg.texi
See: 6bca574a98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
3f3d748cab
x86: Move XOP emulation to x86util
...
We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6c6e4dd139
swr: check that the context for swr_convert() has been initialized
...
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a66be60888
swresample: add swr_is_initialized()
...
Idea-from/based-on: 7e86c27b4e
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
30517a9f05
Use av_frame_copy() to simplify code where appropriate.
11 years ago
Anton Khirnov
8feac29cc4
lavc: use AVFrame API properly in ff_reget_buffer()
11 years ago
Anton Khirnov
1155fd02ae
frame: add a convenience function for copying AVFrame data
11 years ago
Anton Khirnov
746dca483a
avconv: support forcing codec tags for input streams
11 years ago
James Almer
313a6c65b7
oggdec: validate VP8 keyframes
...
Fixes seeking with broken files
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bd8d73ea8b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See: 0bc3de19ff
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d9574069c1
Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'
...
* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
x86: add detection for FMA3 instruction set
Conflicts:
configure
libavutil/cpu.h
libavutil/x86/cpu.c
See: a2af8eddab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0982433253
Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'
...
* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
x86: add missing XOP checks and macros
Conflicts:
configure
libavutil/x86/cpu.h
See: 6c12b1de06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
38336f0fb1
Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'
...
* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
configure: disable cpunop if the check fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
96ea3dea58
configure: Move cpunop into ARCH_EXT_LIST_X86
...
It is a processor feature, so it belongs there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1287b640f0
Merge commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455'
...
* commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455':
hevc: Do not left shift a negative value in hevc_loop_filter_chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a2e4b23bfe
Merge commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676'
...
* commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676':
hevc: Do not right shift a negative value in get_pcm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c2b5981afa
Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'
...
* commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
hevc: Drop unnecessary shifts in deblocking_filter_CTB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
57ec555e8e
avcodec/pngenc: fix invalid read in sub filter.
...
First pixel was computed based on invalid address read, and then
corrected by the following memcpy. After the commit, it's not computed
anymore, and memcpy fills the appropriate area.
Fixes Ticket #3387
11 years ago
Michael Niedermayer
72e6913140
avcodec/h264: clear chroma planes when flags gray is used
...
Fixes Ticket3397
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
42361bdf51
avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
d59fcdaff3
x86: add detection for Bit Manipulation Instruction sets
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
James Almer
1b932eb150
x86: add detection for FMA3 instruction set
...
Based on x264 code
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
James Almer
10b0161d78
x86: add missing XOP checks and macros
...
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
Janne Grunau
5800ba0db6
configure: disable cpunop if the check fails
...
Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in 2b0bb69997
causing build errors with
nasm.
11 years ago