diff options
author | Robert Nagy <ronag89@gmail.com> | 2012-05-28 21:45:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 00:55:23 +0200 |
commit | 0e2b69b4e618733e322b4c0c039eeee5150c4504 (patch) | |
tree | e83ccf320ff08c7217baf2de9fe3d242506e5307 | |
parent | 63040dcdddda982726ef16aa728f1148847c8ac4 (diff) | |
download | ffmpeg-0e2b69b4e618733e322b4c0c039eeee5150c4504.tar.gz |
lavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_from_audio_buffer_ref.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2eae4bae7f5799c0f3cafb0cb189c420782f06c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavfilter/avcodec.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c index 0ccdc5c0cb..3f79c20dff 100644 --- a/libavfilter/avcodec.c +++ b/libavfilter/avcodec.c @@ -59,10 +59,13 @@ int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame, return AVERROR(EINVAL); memcpy(frame->data, samplesref->data, sizeof(frame->data)); - frame->pkt_pos = samplesref->pos; - frame->format = samplesref->format; - frame->nb_samples = samplesref->audio->nb_samples; - frame->pts = samplesref->pts; + memcpy(frame->linesize, samplesref->linesize, sizeof(frame->linesize)); + frame->pkt_pos = samplesref->pos; + frame->format = samplesref->format; + frame->nb_samples = samplesref->audio->nb_samples; + frame->pts = samplesref->pts; + frame->sample_rate = samplesref->audio->sample_rate; + frame->channel_layout = samplesref->audio->channel_layout; return 0; } |