diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 22:41:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 22:58:04 +0200 |
| commit | 349c62410ba92b9513d4a31ec69cbf3ef5240555 (patch) | |
| tree | e14c0ee0b7ebadc38f86b7393db4d216447e3dd7 /libavcodec/utils.c | |
| parent | 432fe9a38afca9104c1c11942d21739e2a48ba96 (diff) | |
| parent | 4f04f5cc8b2a590217fe69492da3d65376ebcff3 (diff) | |
| download | ffmpeg-349c62410ba92b9513d4a31ec69cbf3ef5240555.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
indeo: Drop unused debug function ivi_check_band().
avcodec/utils: cast a function argument to shut up a compiler warning
truemotion1: remove disabled code
fix typo in comment
fate: fix dependencies for non-SAMPLES avconv tests
indeo: check for invalid motion vectors
indeo: check that band output buffer exists
indeo: clear allocated band buffers
indeo: track tile macroblock size
indeo: check custom Huffman tables for errors
factor out common decoding code for Indeo 4 and Indeo 5
mp3: fix start band index for block type 2 in 8kHz audio
lavf: change some (de)muxer names to lowercase
lavf: make output format matching case insensitive
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 223dd3c063..3a858b919f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1212,7 +1212,8 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, avctx->sample_fmt, 1); if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, avctx->sample_fmt, - (const uint8_t *)samples, samples_size, 1))) + (const uint8_t *) samples, + samples_size, 1))) return ret; /* fabricate frame pts from sample count. |