diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-02-25 15:08:33 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-02-25 15:08:33 +0100 |
| commit | 56ffde3f619076650bdc6003cc683cf2f563463f (patch) | |
| tree | 7fefff61aa024dd9a1b73c9dee7cdaab30ea544d | |
| parent | ab3ff19f08b7a83e320c39ab066f289c242b8030 (diff) | |
| download | ffmpeg-56ffde3f619076650bdc6003cc683cf2f563463f.tar.gz | |
Allow muxing h264 into ts with startcode "001" instead of "0001".
Fixes ticket #2220.
Fixes ticket #4324.
| -rw-r--r-- | libavformat/mpegtsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 11dcf9ce49..cc650bbd29 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1203,7 +1203,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, int ff_check_h264_startcode(AVFormatContext *s, const AVStream *st, const AVPacket *pkt) { - if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { + if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001 && AV_RB24(pkt->data) != 0x000001) { if (!st->nb_frames) { av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, " "no startcode found, use the video bitstream filter 'h264_mp4toannexb' to fix it " |