diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 22:18:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 00:28:06 +0200 |
| commit | 123272374180d8dc3ce9dff50f0c77d5b3b3341f (patch) | |
| tree | 2c2add85161e74ebe6d4301a6607adc521112582 /libavcodec/aacenc.c | |
| parent | a66675268f63dd6794ce946c7edbcb8b49ae0f13 (diff) | |
| parent | 0f96f0d9968a767ead3aec823fcdfb78f26f7be7 (diff) | |
| download | ffmpeg-123272374180d8dc3ce9dff50f0c77d5b3b3341f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix issues with huge values of bit_rate.
dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
proresenc: multithreaded quantiser search
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
avconv: only set the "channels" option when it exists for the specified input format
avplay: update get_buffer to be inline with avconv
aacdec: More robust output configuration.
faac: Fix multi-channel ordering
faac: Add .channel_layouts
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
rtmp: Support 'rtmp_app', an option which overrides the name of application
avutil: add better documentation for AVSampleFormat
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/aacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacenc.c')
| -rw-r--r-- | libavcodec/aacenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 3460d51218..234ebff39a 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -571,8 +571,10 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } start_ch += chans; } - if ((ret = ff_alloc_packet2(avctx, avpkt, 768 * s->channels))) + if ((ret = ff_alloc_packet2(avctx, avpkt, 768 * s->channels))) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); return ret; + } do { int frame_bits; |