Merge commit '763d69bf'

* commit '763d69bf':
  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>

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