Michael Niedermayer
d3284a6208
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/qtkit: add device category
lavd/fbdev_enc: implement get_device_list
lavd: no default device unless explicitly set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
275155081f
Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'
...
* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
doc: Libavfilter English cleanup
Conflicts:
doc/filters.texi
doc/libavfilter.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
571d2ffa47
Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
...
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
See: 40176fc314
See: d62bf5d4e7
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4f698be8f6
avutil/log: add av_log_get_flags()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lukasz Marek
defb87eef4
lavd/qtkit: add device category
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Lukasz Marek
afc898e7ce
lavd/fbdev_enc: implement get_device_list
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Lukasz Marek
c1c3c3611e
lavd: no default device unless explicitly set
...
AVDeviceInfoList was allocated with first device set as default
even though there is no device after allocation.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
11 years ago
Michael Niedermayer
e89f3d0ed2
avcodec/ffv1: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
713e62e91d
avcodec/faxcompr: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
36053aeff6
vcodec/error_resilience: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Katerina Barone-Adesi
d4a8a86c68
doc: Libavfilter English cleanup
...
This aims to standardize the English used in the libavfilter
documentation, describing the same thing in the same way more often,
and significantly reduce the amount of outright errors, including
run-on sentences and sentence fragments.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
617a1a98a6
mp3enc: Properly write bitrate value in XING header
...
Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.
Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.
Bug-Id: https://bugs.debian.org/736088
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
fb4ac46d7f
avcodec/elbg: Use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
46375e9a97
avcodec/diracdec: use av_malloc(z)_array
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f683895dee
avformat/img2dec: support nanosecond file times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Schenk
513a431e07
avformat/hls: reduce memory usage by using dynamically allocated url/key
...
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
11 years ago
Michael Niedermayer
66e959682c
avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small
...
Fixes Ticket3257
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
27763db928
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Improve amr bitrate calculation for VBR files.
Warn if rawvideo and an unreadable pix_fmt are written.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
88ceede1fd
avcodec/jpegls: print coding parameters stored in LSE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
c43222f436
Improve amr bitrate calculation for VBR files.
...
Fixes ticket #3541 .
11 years ago
Carl Eugen Hoyos
8b122937af
Warn if rawvideo and an unreadable pix_fmt are written.
...
Print an error if a combination of rawvideo and an unusual pix_fmt
that will be impossible to decode are written to avi or mov.
Fixes ticket #3545 .
11 years ago
Michael Niedermayer
662a8d8827
Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83'
...
* commit '254c95cdd1b669a722204a4a65974fc2523c8f83':
resample: split linear into its own function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
65088b925a
Merge commit 'be394968c81019887ef996a78a526bdd85d1e216'
...
* commit 'be394968c81019887ef996a78a526bdd85d1e216':
resample: add initial padding explicitly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6d6bd16fce
Merge commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3'
...
* commit 'eed752d61da332fb13e9893a175a90fed7b1d7d3':
resample: drop useless abs()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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