Mercurial > mplayer.hg
comparison sub/av_sub.c @ 35715:8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
author | diego |
---|---|
date | Mon, 21 Jan 2013 19:44:53 +0000 |
parents | 9b921155e030 |
children | 9b88b87f5921 |
comparison
equal
deleted
inserted
replaced
35714:fc36990b6ae5 | 35715:8517826b0dbd |
---|---|
82 */ | 82 */ |
83 int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, | 83 int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, |
84 double *pts, double *endpts) | 84 double *pts, double *endpts) |
85 { | 85 { |
86 AVCodecContext *ctx = sh->context; | 86 AVCodecContext *ctx = sh->context; |
87 enum CodecID cid = CODEC_ID_NONE; | 87 enum CodecID cid = AV_CODEC_ID_NONE; |
88 int new_type = 0; | 88 int new_type = 0; |
89 int res; | 89 int res; |
90 int got_sub; | 90 int got_sub; |
91 AVSubtitle sub; | 91 AVSubtitle sub; |
92 AVPacket pkt; | 92 AVPacket pkt; |
93 | 93 |
94 switch (sh->type) { | 94 switch (sh->type) { |
95 case 'b': | 95 case 'b': |
96 cid = CODEC_ID_DVB_SUBTITLE; break; | 96 cid = AV_CODEC_ID_DVB_SUBTITLE; break; |
97 case 'p': | 97 case 'p': |
98 cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; | 98 cid = AV_CODEC_ID_HDMV_PGS_SUBTITLE; break; |
99 case 'x': | 99 case 'x': |
100 cid = CODEC_ID_XSUB; break; | 100 cid = AV_CODEC_ID_XSUB; break; |
101 } | 101 } |
102 | 102 |
103 av_init_packet(&pkt); | 103 av_init_packet(&pkt); |
104 pkt.data = *data; | 104 pkt.data = *data; |
105 pkt.size = *size; | 105 pkt.size = *size; |