diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 01:23:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 01:23:15 +0100 |
| commit | 175cc378b3bd970caf1641e5df3361d6233747e1 (patch) | |
| tree | d237cb08b1b6909154a007d3c06f0dab61b9700f /libavcodec/v410enc.c | |
| parent | 56669837ce18d15d757a144712a082b9cb535c94 (diff) | |
| parent | d3b8bde2f14f78109a892e57f544bf840cf6d4fc (diff) | |
| download | ffmpeg-175cc378b3bd970caf1641e5df3361d6233747e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Rudimentary IODs support.
v410enc: fix output buffer size check
v410enc: include correct headers
fate: add -pix_fmt rgb48le to r210 test
flvenc: Support muxing 16 kHz nellymoser
configure: refactor list of programs into a variable
fate: add r210 decoder test
fate: split off Indeo FATE tests into their own file
fate: split off ATRAC FATE tests into their own file
fate: Add FATE tests for v410 encoder and decoder
ARM: fix external symbol refs in rv40 asm
westwood: Make sure audio header info is present when parsing audio packets
libgsm: Reset the MS mode of GSM in the flush function
libgsm: Set options on the right object
ARM: dca: disable optimised decode_blockcodes() for old gcc
Conflicts:
configure
libavformat/movenc.c
libavformat/movenc.h
tests/fate2.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v410enc.c')
| -rw-r--r-- | libavcodec/v410enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index ea66653412..e6c837eef6 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "put_bits.h" static av_cold int v410_encode_init(AVCodecContext *avctx) { @@ -50,7 +50,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf, int i, j; int output_size = 0; - if (buf_size < avctx->width * avctx->height * 3) { + if (buf_size < avctx->width * avctx->height * 4) { av_log(avctx, AV_LOG_ERROR, "Out buffer is too small.\n"); return AVERROR(ENOMEM); } |