diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:12:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:12:11 +0100 |
| commit | 72ad824a86233fb0c81a1581a1a7e6468dca6b0f (patch) | |
| tree | d0b0b3a5141fe43d8c15a5050813ceb583fee751 /libavutil/frame.c | |
| parent | df4517106a3ca494bbdd9c42a5eae1f74f8c3ad3 (diff) | |
| parent | f1b716c79b958156e04d5d1683e7e53152cfe914 (diff) | |
| download | ffmpeg-72ad824a86233fb0c81a1581a1a7e6468dca6b0f.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
avframe: Copy buffer type in copy_props.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.c')
| -rw-r--r-- | libavutil/frame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 4ec7bee769..bd3df400b6 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -395,6 +395,9 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) dst->top_field_first = src->top_field_first; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; +#if FF_API_AVFRAME_LAVC + dst->type = src->type; +#endif dst->pkt_pts = src->pkt_pts; dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; |