Changeset 38e867f6 in ffmpeg
- Timestamp:
- Feb 17, 2015, 9:55:27 PM (10 years ago)
- Branches:
- master
- Children:
- 2e786bc4
- Parents:
- 62aec0c2 (diff), 18f4fa25 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Michael Niedermayer <michaelni@gmx.at> (02/17/15 21:54:56)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (02/17/15 21:55:27)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libavcodec/aac_adtstoasc_bsf.c
r62aec0c2 r38e867f6 91 91 avctx->extradata_size = 2 + pce_size; 92 92 avctx->extradata = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); 93 if (!avctx->extradata) 94 return AVERROR(ENOMEM); 93 95 94 96 init_put_bits(&pb, avctx->extradata, avctx->extradata_size);
Note:
See TracChangeset
for help on using the changeset viewer.