Michael Niedermayer
fb7d64df7e
Merge commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5'
...
* commit '3c84f6b5d20cd345fac706f8cfb70c55e541ffb5':
resample: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
671f908657
Merge commit 'f20892eb67a7b4b5a3c080388a35a3380516a805'
...
* commit 'f20892eb67a7b4b5a3c080388a35a3380516a805':
resample: split the nearest neighbour path into a separate function pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c04961fa0f
Merge commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f'
...
* commit 'b9dea23766f52b8e059e72d34980bb7b456efe8f':
resample: fix avresample_get_delay() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Thilo Borgmann
d2417061ef
Add AVFoundation input device.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
254c95cdd1
resample: split linear into its own function
11 years ago
Anton Khirnov
be394968c8
resample: add initial padding explicitly
...
This simplifies the code, since we do not have to deal with a possibly
negative source index anymore.
11 years ago
Anton Khirnov
eed752d61d
resample: drop useless abs()
...
negative sample_index is handled in the block above.
11 years ago
Anton Khirnov
3c84f6b5d2
resample: reindent
11 years ago
Anton Khirnov
f20892eb67
resample: split the nearest neighbour path into a separate function pointer
11 years ago
Anton Khirnov
b9dea23766
resample: fix avresample_get_delay() return value
...
The correct "next" input sample is not the first sample of the
resampling buffer, but the center sample of the filter_length-sized
block at the beginning.
CC:libav-stable@libav.org
11 years ago
Lukasz Marek
c02e3dca2d
lavd: add control message enums
...
Adds messages that allows to control (audio) buffer and play/pause state.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Lukasz Marek
6db42a2b6b
lavd: add device capabilities API
...
Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
11 years ago
Michael Niedermayer
4899ccd295
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
DNxHD: convert inline asm to yasm
Conflicts:
libavcodec/x86/Makefile
libavcodec/x86/dnxhdenc.asm
See: 9d34dce05b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ee2a43798c
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
...
* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
Conflicts:
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c
See: cb11b9e89e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bad101ab8a
Merge commit '89ef08c992c484a46711b1a68a988303679c288e'
...
* commit '89ef08c992c484a46711b1a68a988303679c288e':
DNxHD: K&R formatting cosmetics
Conflicts:
libavcodec/dnxhd_parser.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Timothy Gu
71c32ed533
DNxHD: convert inline asm to yasm
11 years ago
Timothy Gu
676856204b
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
11 years ago
Vittorio Giovara
89ef08c992
DNxHD: K&R formatting cosmetics
11 years ago
Michael Niedermayer
d9fef740bd
avcodec/dnxhdenc: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1de8a4f736
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mp2: Do not force a samplerate
Conflicts:
libavcodec/mpegaudioenc_template.c
Only libtwolame changes, as the forcing of a sample rate was not merged for the native mp2 encoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
268b1eae22
avcodec/mpegaudioenc_template: default to 384k bitrate as default
...
If 384k is too high for the samplerate, choose the closest
possible
Idea to increase the bitrate from: 46439e1562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
a7448064c5
mp2: Do not force a samplerate
...
The default should be not to resample.
11 years ago
Anssi Hannula
39b192b8e1
avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol
...
ffurl_seek() will not work even when it should be a no-op, so do not
call it on crypto protocol.
Also replace use of ffurl_size() for the same reason.
Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
11 years ago
Michael Niedermayer
517cc81e93
ffmpeg: stop protocols on interrupt when no transcoding has happened yet
...
Fixes Ticket3344
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
ecb80fe78c
Cosmetics: Remove an outdated comment from lavc/rawdec.c.
...
The missing swscale feature was implemented in 2011.
11 years ago
Michael Niedermayer
6290ba0052
avfilter/settb: remove duplicate #include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
09c1654208
lavf/rtspcodes: add missing header include
...
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a4662cd6b1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libx265: Only set the SAR if it is valid
libx265: Use 16-bit SAR
libx265: Use x265_param_parse to set the SAR
See: 8945dcbb52
See: fcc43e02d3
See: cdd21f1f03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4d4bc89409
avformat/mov: merge mov_read_custom_metadata() and mov_read_custom()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6e573b7759
Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431'
...
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
mov: read hydrogenaudio replaygain information
Conflicts:
libavformat/Makefile
libavformat/mov.c
See: 37a15f3e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c486cfab79
avcodec/imgconvert: fix nb_components and depth for PAL8 in get_pix_fmt_score()
...
This causes us to favor RGB8 over PAL8 when FF_LOSS_COLORQUANT is used
It probably makes sense to reinvestigate the exact scoring of pal8 when
our pal8 support improves to be supperior to rgb8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
cdd21f1f03
libx265: Only set the SAR if it is valid
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
fcc43e02d3
libx265: Use 16-bit SAR
...
The spec says it is 16 bits.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Matt Oliver
d1e6e5c887
avcodec/x86: Exclude broken get_cabac under icl.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4764714952
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavfilter: Add asettb filter for setting timebase for audio
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h
See: ba856c0be5
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
25fbfeed98
libx265: Only set the SAR if it is valid
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
cd0ac6f6e5
libx265: Use 16-bit SAR
...
The spec says it is 16 bits.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
8945dcbb52
libx265: Use x265_param_parse to set the SAR
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
4a2226451e
libx265: Use x265_param_parse to set the SAR
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Anton Khirnov
9a07fac678
mov: read hydrogenaudio replaygain information
11 years ago
Nicolas George
ad8159e0fe
libavfilter: Add asettb filter for setting timebase for audio
...
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.
Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Lukasz Marek
e1c48e3593
lavf/utils: fix mem leak
...
Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
fbf05759e3
sws: fix warning about RGB_PACK24_B_OPERANDS redefinition
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
421c116fc4
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix a typo in amr.c.
Remove an unneeded include of avassert.h from amr.c.
Do not allow writing invalid wav channel layouts by default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
849d40dce6
avcodec/mpegvideo_enc: change some asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
968516cebf
avformat/nut: add ff_nut_audio_extra_tags to demuxer too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
cf79f20275
Fix a typo in amr.c.
11 years ago
Carl Eugen Hoyos
2a3ff9fbba
Remove an unneeded include of avassert.h from amr.c.
11 years ago
Carl Eugen Hoyos
bf87d582b1
Do not allow writing invalid wav channel layouts by default.
...
Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543 .
11 years ago
Michael Niedermayer
f703dae7aa
avcodec/cngdec: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago