ffmpeg | branch: master | Zane van Iperen <z...@zanevaniperen.com> | Wed Jul 8 00:42:09 2020 +1000| [1b0a0da63a279804df04292cf452b2acdd87b687] | committer: Zane van Iperen
avformat/apm: use the entire APMState structure as extradata Is the "actual" codec extradata instead of the hand-crafted one from the previous revision. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b0a0da63a279804df04292cf452b2acdd87b687 --- libavformat/apm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 4158b81457..8d655d0a33 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -26,6 +26,7 @@ #define APM_FILE_HEADER_SIZE 18 #define APM_FILE_EXTRADATA_SIZE 80 +#define APM_EXTRADATA_SIZE 28 #define APM_MAX_READ_SIZE 4096 @@ -160,13 +161,11 @@ static int apm_read_header(AVFormatContext *s) return AVERROR_PATCHWELCOME; } - if ((ret = ff_alloc_extradata(st->codecpar, 16)) < 0) + if ((ret = ff_alloc_extradata(st->codecpar, APM_EXTRADATA_SIZE)) < 0) return ret; - AV_WL32(st->codecpar->extradata + 0, vs12.state.predictor_l); - AV_WL32(st->codecpar->extradata + 4, vs12.state.step_index_l); - AV_WL32(st->codecpar->extradata + 8, vs12.state.predictor_r); - AV_WL32(st->codecpar->extradata + 12, vs12.state.step_index_r); + /* Use the entire state as extradata. */ + memcpy(st->codecpar->extradata, buf + 20, APM_EXTRADATA_SIZE); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); st->start_time = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
