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 <clement@stupeflix.com>

diff --cc libavcodec/qtrleenc.c
index 5aa7420ae4b71fd652ba34ffe9bb0541d4a53d24,e7de20919a1c5f60fa3414df073fdfc95fc14dac..adbd9f3b44b6caac14e480e696ccbe6389e8e05d
--- 1/libavcodec/qtrleenc.c
--- 2/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 */