Commit 56ffde3f authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Allow muxing h264 into ts with startcode "001" instead of "0001".

Fixes ticket #2220.
Fixes ticket #4324.
parent ab3ff19f
......@@ -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 "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment