diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:19 +0200 |
| commit | ab46300078d6c047c975c43baa71a32ca707e312 (patch) | |
| tree | 7c19f2d74084f63bc80e72af6e5056266f05b4c3 /libavcodec/libfdk-aacenc.c | |
| parent | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (diff) | |
| parent | 86dd5fbf1505a09afe8eaa66548e8876d5a9e817 (diff) | |
| download | ffmpeg-ab46300078d6c047c975c43baa71a32ca707e312.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
doc: Remove stray @item from git-howto
libfdk-aac: Port to ff_alloc_packet2
doxy: move av_guess_sample_aspect_ratio to correct place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 80d2652eab..cb1baf37a8 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -315,7 +315,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } /* The maximum packet size is 6144 bits aka 768 bytes per channel. */ - if ((ret = ff_alloc_packet(avpkt, FFMAX(8192, 768 * avctx->channels)))) { + if ((ret = ff_alloc_packet2(avctx, avpkt, FFMAX(8192, 768 * avctx->channels)))) { av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); return ret; } |