virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  avframe: Copy buffer type in copy_props.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-13 13:12:06 +01:00
parent df4517106a f1b716c79b
commit 72ad824a86
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/frame.c
View File

@@ -395,6 +395,9 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
dst->top_field_first = src->top_field_first; dst->top_field_first = src->top_field_first;
dst->sample_rate = src->sample_rate; dst->sample_rate = src->sample_rate;
dst->opaque = src->opaque; dst->opaque = src->opaque;
#if FF_API_AVFRAME_LAVC
dst->type = src->type;
#endif
dst->pkt_pts = src->pkt_pts; dst->pkt_pts = src->pkt_pts;
dst->pkt_dts = src->pkt_dts; dst->pkt_dts = src->pkt_dts;
dst->pkt_pos = src->pkt_pos; dst->pkt_pos = src->pkt_pos;