diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:31:45 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 17:31:45 +0200 |
| commit | b9fd813351733b867fb73219e33b1f4845b40dde (patch) | |
| tree | 5eabf60865b557c7616892fa6ce7c2676f97cb54 /libavutil/frame.c | |
| parent | f1b02e6ca88909f428d4a690c47620575853b647 (diff) | |
| parent | 8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79 (diff) | |
Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'
* commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79':
lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil/frame.c')
| -rw-r--r-- | libavutil/frame.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 3a84811b87..f403fd75dd 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -289,11 +289,6 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) dst->palette_has_changed = src->palette_has_changed; dst->sample_rate = src->sample_rate; dst->opaque = src->opaque; -#if FF_API_AVFRAME_LAVC -FF_DISABLE_DEPRECATION_WARNINGS - dst->type = src->type; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->pkt_pts = src->pkt_pts; dst->pkt_dts = src->pkt_dts; dst->pkt_pos = src->pkt_pos; |