Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 36078:c297c1a78ae6
Add support for AV_CODEC_ID_ASS.
Lavf/mkv will output proper ASS packet at next bump. MPlayer code base already
supports such packets, so only a trivial change is required.
See 7c1a002c78f15470f76d5c03e619b954d1a22839 in FFmpeg git history for more
information.
| author | cboesch |
|---|---|
| date | Thu, 18 Apr 2013 21:54:53 +0000 |
| parents | 66bbe17c4abc |
| children | 8fd75794d4f4 |
comparison
equal
deleted
inserted
replaced
| 36077:bb7b0b97c1e4 | 36078:c297c1a78ae6 |
|---|---|
| 439 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ | 439 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ |
| 440 ) | 440 ) |
| 441 type = 't'; | 441 type = 't'; |
| 442 else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT) | 442 else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT) |
| 443 type = 'm'; | 443 type = 'm'; |
| 444 else if (codec->codec_id == AV_CODEC_ID_SSA) | 444 else if (codec->codec_id == AV_CODEC_ID_SSA |
| 445 #if LIBAVUTIL_VERSION_MICRO >= 100 | |
| 446 || codec->codec_id == AV_CODEC_ID_ASS | |
| 447 #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ | |
| 448 ) | |
| 445 type = 'a'; | 449 type = 'a'; |
| 446 else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) | 450 else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) |
| 447 type = 'v'; | 451 type = 'v'; |
| 448 else if (codec->codec_id == AV_CODEC_ID_XSUB) | 452 else if (codec->codec_id == AV_CODEC_ID_XSUB) |
| 449 type = 'x'; | 453 type = 'x'; |