ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 22 11:06:04 2016 +0200| [e6247a22c0238a73024f29bcced8ae828fe3b39a] | committer: Clément Bœsch
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b' * commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b': Add some more deprecation guards - psnr() deprecation is not merged within ffmpeg.c as we still use it in non-deprecated code - the XVMC chunk is not merged as we still apparently maintain it - The guarding in lavc/qtrleenc.c could be simplified but merged anyway. Merged-by: Clément Bœsch <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6247a22c0238a73024f29bcced8ae828fe3b39a --- libavcodec/qtrleenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index 5aa7420..adbd9f3 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -363,7 +363,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { QtrleEncContext * const s = avctx->priv_data; +#if FF_API_CODED_FRAME enum AVPictureType pict_type; +#endif int ret; if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size, 0)) < 0) @@ -371,11 +373,15 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) { /* I-Frame */ +#if FF_API_CODED_FRAME pict_type = AV_PICTURE_TYPE_I; +#endif s->key_frame = 1; } else { /* P-Frame */ +#if FF_API_CODED_FRAME pict_type = AV_PICTURE_TYPE_P; +#endif s->key_frame = 0; } ====================================================================== diff --cc libavcodec/qtrleenc.c index 5aa7420,e7de209..adbd9f3 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@@ -363,11 -297,16 +363,13 @@@ static int qtrle_encode_frame(AVCodecCo const AVFrame *pict, int *got_packet) { QtrleEncContext * const s = avctx->priv_data; + #if FF_API_CODED_FRAME enum AVPictureType pict_type; + #endif int ret; - if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) { - /* Upper bound check for compressed data */ - av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size); + if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size, 0)) < 0) return ret; - } if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) { /* I-Frame */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
