Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'

* commit '7effebde78977fafce935776153ea2f7c0981fa3':
  dvbsubdec: Remove disabled, near-duplicate debug code

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/dvbsubdec.c
index bf3b1a1019e8e6ad8526c85bac2a7592e56b1e06,ccdfc01089a35ce946c68a74ed0c93d02c0de7c5..7c27d69ce27e2f0358b4e7f4eab11f118117a140
--- 1/libavcodec/dvbsubdec.c
--- 2/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@@ -1540,9 -1204,9 +1482,9 @@@ static int save_display_set(DVBSubConte
  
          snprintf(filename, sizeof(filename), "dvbs.%d", fileno_index);
  
-         png_save2(filename, pbuf, width, height);
+         png_save(filename, pbuf, width, height);
  
 -        av_free(pbuf);
 +        av_freep(&pbuf);
      }
  
      fileno_index++;