Mercurial > mplayer.hg

diff sub/av_sub.c @ 35715:8517826b0dbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace CODEC_IDs their modern AV_-prefixed counterparts.
author diego
date Mon, 21 Jan 2013 19:44:53 +0000
parents 9b921155e030
children 9b88b87f5921
line wrap: on
line diff
--- a/sub/av_sub.c	Mon Jan 21 19:44:49 2013 +0000
+++ b/sub/av_sub.c	Mon Jan 21 19:44:53 2013 +0000
@@ -84,7 +84,7 @@
                  double *pts, double *endpts)
 {
     AVCodecContext *ctx = sh->context;
-    enum CodecID cid = CODEC_ID_NONE;
+    enum CodecID cid = AV_CODEC_ID_NONE;
     int new_type = 0;
     int res;
     int got_sub;
@@ -93,11 +93,11 @@
 
     switch (sh->type) {
     case 'b':
-        cid = CODEC_ID_DVB_SUBTITLE; break;
+        cid = AV_CODEC_ID_DVB_SUBTITLE; break;
     case 'p':
-        cid = CODEC_ID_HDMV_PGS_SUBTITLE; break;
+        cid = AV_CODEC_ID_HDMV_PGS_SUBTITLE; break;
     case 'x':
-        cid = CODEC_ID_XSUB; break;
+        cid = AV_CODEC_ID_XSUB; break;
     }
 
     av_init_packet(&pkt);