diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index 1fa3aa5e92..b89851fbbb 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -28,7 +28,8 @@ #define CAVS_UNDEF_START_CODE 0x000001b4 #define CAVS_PIC_PB_START_CODE 0x000001b6 #define CAVS_VIDEO_EDIT_CODE 0x000001b7 -#define CAVS_PROFILE_JIZHUN 0x20 +#define CAVS_PROFILE_JIZHUN 0x20 // AVS1 P2 +#define CAVS_PROFILE_GUANGDIAN 0x48 // AVS1 P16/AVS+ static int cavsvideo_probe(const AVProbeData *p) { @@ -50,7 +51,7 @@ static int cavsvideo_probe(const AVProbeData *p) if (code == CAVS_SEQ_START_CODE) { seq++; /* check for the only currently supported profile */ - if (*ptr != CAVS_PROFILE_JIZHUN) + if (*ptr != CAVS_PROFILE_JIZHUN && *ptr != CAVS_PROFILE_GUANGDIAN) return 0; } else if ((code == CAVS_PIC_I_START_CODE) || (code == CAVS_PIC_PB_START_CODE)) { @@ -66,4 +67,4 @@ static int cavsvideo_probe(const AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, AV_CODEC_ID_CAVS) +FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, "avs", AV_CODEC_ID_CAVS)