Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/mpeg: Support demuxing HEVC in mpeg-ps.

Browse Source
pull/299/head
Carl Eugen Hoyos 7 years ago
parent 476a77128a
commit 303439bc5f
2 changed files with 4 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavformat/mpeg.c
  2. 1
      libavformat/mpeg.h

3
libavformat/mpeg.c
Unescape View File

@ -544,6 +544,9 @@ redo:
} else if (es_type == STREAM_TYPE_VIDEO_H264) { } else if (es_type == STREAM_TYPE_VIDEO_H264) {
codec_id = AV_CODEC_ID_H264; codec_id = AV_CODEC_ID_H264;
type = AVMEDIA_TYPE_VIDEO; type = AVMEDIA_TYPE_VIDEO;
} else if (es_type == STREAM_TYPE_VIDEO_HEVC) {
codec_id = AV_CODEC_ID_HEVC;
type = AVMEDIA_TYPE_VIDEO;
} else if (es_type == STREAM_TYPE_AUDIO_AC3) { } else if (es_type == STREAM_TYPE_AUDIO_AC3) {
codec_id = AV_CODEC_ID_AC3; codec_id = AV_CODEC_ID_AC3;
type = AVMEDIA_TYPE_AUDIO; type = AVMEDIA_TYPE_AUDIO;

1
libavformat/mpeg.h
Unescape View File

@ -55,6 +55,7 @@
#define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_AUDIO_AAC 0x0f
#define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_MPEG4 0x10
#define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_H264 0x1b
#define STREAM_TYPE_VIDEO_HEVC 0x24
#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_CAVS 0x42
#define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_AC3 0x81

Write Preview
Loading…
Cancel
Save