10l trocadero: now return value of ff_rtmp_packet_read() has different meaning

[ffmpeg] / libavformat / matroska.c

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index f101a000b4ebfe171bb2d230983cfed35baec84b..f208e329be4d5b0c04d7e97003073e2ad8a4bb51 100644 (file)
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -58,6 +58,7 @@ const CodecTags ff_mkv_codec_tags[]={
     {"S_ASS"            , CODEC_ID_SSA},
     {"S_SSA"            , CODEC_ID_SSA},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
+    {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
 
     {"V_DIRAC"          , CODEC_ID_DIRAC},
     {"V_MJPEG"          , CODEC_ID_MJPEG},