diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-08 21:10:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-08 22:02:59 +0200 |
| commit | b4178a3f13784604281dc3da31383783676b8fec (patch) | |
| tree | 5cbcf5e4bf9288ee4743e47e90a3dcacb45f3df0 /libavutil | |
| parent | b4b58485135dbc37a6cf8a57196157b1d67d13e1 (diff) | |
| parent | b2e495afa8e23b46536e25e892157104437f4020 (diff) | |
| download | ffmpeg-b4178a3f13784604281dc3da31383783676b8fec.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream.
av_samples_fill_array: Mark unmodified function argument as const.
lagarith: add YUY2 decoding support
Support decoding unaligned rgb24 lagarith.
dv: Split profile handling code into a separate file.
flvenc: use AVFormatContext, not AVCodecContext for logging.
mov: Remove write-only variable in mov_read_chan().
fate: Change the probe-format refs to match the final text format committed.
fate: Add avprobe as a make dependency
Add probe fate tests to test for regressions in detecting media types.
fate: Add oneline comparison method
qdm2: clip array indices returned by qdm2_get_vlc().
avplay: properly close/reopen AVAudioResampleContext on channel layout change
avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()
avcodec: for audio encoding, reset output packet when it is not valid
avcodec: refactor avcodec_encode_audio2() to merge common branches
avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()
Conflicts:
ffplay.c
libavcodec/Makefile
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/qdm2.c
libavcodec/utils.c
libavformat/flvenc.c
libavformat/mov.c
tests/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/samplefmt.c | 2 | ||||
| -rw-r--r-- | libavutil/samplefmt.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 69939c48f0..560c7f5cd5 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -152,7 +152,7 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, } int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, - uint8_t *buf, int nb_channels, int nb_samples, + const uint8_t *buf, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int align) { int ch, planar, buf_size, line_size; diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 99fde99e8c..fa55efe78a 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -178,7 +178,8 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, * @param align buffer size alignment (0 = default, 1 = no alignment) * @return 0 on success or a negative error code on failure */ -int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf, +int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, + const uint8_t *buf, int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int align); |