diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-08-08 13:05:12 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-08-26 03:43:13 +0200 |
| commit | 4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9 (patch) | |
| tree | 377da75a301b65ed518ab6f2307508902d9f7d31 | |
| parent | a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e (diff) | |
| download | ffmpeg-4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9.tar.gz | |
mpeg: Write H264 streams at offset 2
It hints that the content is H264 according to HD-DVD.
| -rw-r--r-- | libavformat/mpeg.h | 1 | ||||
| -rw-r--r-- | libavformat/mpegenc.c | 13 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index 629f2f061d..d0b36ee153 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -40,6 +40,7 @@ #define AUDIO_ID 0xc0 #define VIDEO_ID 0xe0 +#define H264_ID 0xe2 #define AC3_ID 0x80 #define DTS_ID 0x8a #define LPCM_ID 0xa0 diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 1ba7647e80..02437a8cf6 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -301,7 +301,7 @@ static int get_system_header_size(AVFormatContext *ctx) static av_cold int mpeg_mux_init(AVFormatContext *ctx) { MpegMuxContext *s = ctx->priv_data; - int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j; + int bitrate, i, mpa_id, mpv_id, h264_id, mps_id, ac3_id, dts_id, lpcm_id, j; AVStream *st; StreamInfo *stream; int audio_bitrate; @@ -337,6 +337,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) ac3_id = AC3_ID; dts_id = DTS_ID; mpv_id = VIDEO_ID; + h264_id = H264_ID; mps_id = SUB_ID; lpcm_id = LPCM_ID; @@ -379,7 +380,10 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) s->audio_bound++; break; case AVMEDIA_TYPE_VIDEO: - stream->id = mpv_id++; + if (st->codec->codec_id == AV_CODEC_ID_H264) + stream->id = h264_id++; + else + stream->id = mpv_id++; if (st->codec->rc_buffer_size) stream->max_buffer_size = 6 * 1024 + st->codec->rc_buffer_size / 8; else { @@ -409,7 +413,8 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) st = ctx->streams[i]; stream = (StreamInfo *)st->priv_data; - if (st->codec->rc_max_rate || stream->id == VIDEO_ID) + if (st->codec->rc_max_rate || + st->codec->codec_type == AVMEDIA_TYPE_VIDEO) codec_rate = st->codec->rc_max_rate; else codec_rate = st->codec->bit_rate; @@ -421,7 +426,7 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) if ((stream->id & 0xe0) == AUDIO_ID) audio_bitrate += codec_rate; - else if (stream->id == VIDEO_ID) + else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) video_bitrate += codec_rate; } |