Unified · Split
| @@ -1644,8 +1644,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 1643 unmodified lines | |||
| 1644 | } | 1644 | } |
| 1645 | 1645 | ||
| 1646 | ff_snow_frame_start(s); | 1646 | ff_snow_frame_start(s); |
| 1647 | #if FF_API_CODED_FRAME | ||
| 1648 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 1647 | av_frame_unref(avctx->coded_frame); | 1649 | av_frame_unref(avctx->coded_frame); |
| 1648 | ret = av_frame_ref(avctx->coded_frame, s->current_picture); | 1650 | ret = av_frame_ref(avctx->coded_frame, s->current_picture); |
| 1651 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 1652 | #endif | ||
| 1649 | if (ret < 0) | 1653 | if (ret < 0) |
| 1650 | return ret; | 1654 | return ret; |
| 1651 | 1655 | ||
| @@ -1675,7 +1679,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 23 unmodified lines | |||
| 1675 | s->m.f_code=1; | 1679 | s->m.f_code=1; |
| 1676 | s->m.pict_type = pic->pict_type; | 1680 | s->m.pict_type = pic->pict_type; |
| 1677 | #if FF_API_MOTION_EST | 1681 | #if FF_API_MOTION_EST |
| 1682 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 1678 | s->m.me_method= s->avctx->me_method; | 1683 | s->m.me_method= s->avctx->me_method; |
| 1684 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 1679 | #endif | 1685 | #endif |
| 1680 | s->m.motion_est= s->motion_est; | 1686 | s->m.motion_est= s->motion_est; |
| 1681 | s->m.me.scene_change_score=0; | 1687 | s->m.me.scene_change_score=0; |
| @@ -1878,10 +1884,14 @@ FF_ENABLE_DEPRECATION_WARNINGS · 196 unmodified lines | |||
| 1878 | if(avctx->flags&AV_CODEC_FLAG_PASS1) | 1884 | if(avctx->flags&AV_CODEC_FLAG_PASS1) |
| 1879 | ff_write_pass1_stats(&s->m); | 1885 | ff_write_pass1_stats(&s->m); |
| 1880 | s->m.last_pict_type = s->m.pict_type; | 1886 | s->m.last_pict_type = s->m.pict_type; |
| 1887 | #if FF_API_STAT_BITS | ||
| 1888 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 1881 | avctx->frame_bits = s->m.frame_bits; | 1889 | avctx->frame_bits = s->m.frame_bits; |
| 1882 | avctx->mv_bits = s->m.mv_bits; | 1890 | avctx->mv_bits = s->m.mv_bits; |
| 1883 | avctx->misc_bits = s->m.misc_bits; | 1891 | avctx->misc_bits = s->m.misc_bits; |
| 1884 | avctx->p_tex_bits = s->m.p_tex_bits; | 1892 | avctx->p_tex_bits = s->m.p_tex_bits; |
| 1893 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 1894 | #endif | ||
| 1885 | 1895 | ||
| 1886 | emms_c(); | 1896 | emms_c(); |
| 1887 | 1897 | ||