ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 22:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'

Browse Source 
* 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 <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-22 11:06:04 +02:00
commit e6247a22c0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/qtrleenc.c
View File

@ -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;
}