diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-23 16:20:22 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-23 16:20:22 +0200 |
| commit | 27d460fe98218d50e73b995ee8e4dd4bc0953c84 (patch) | |
| tree | 012aea3bbc1ef7b5735fcd525e2954c9cd05b816 /libavformat/avienc.c | |
| parent | 6a4832caaede15e3d918b1408ff83fe30324507b (diff) | |
| download | ffmpeg-streaming-27d460fe98218d50e73b995ee8e4dd4bc0953c84.zip ffmpeg-streaming-27d460fe98218d50e73b995ee8e4dd4bc0953c84.tar.gz | |
Refuse to mux H.264 with fourcc H264 into avi without startcode.
Fixes ticket #3638.
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 4544a68..b6a329d 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -26,6 +26,7 @@ #include "avi.h" #include "avio_internal.h" #include "riff.h" +#include "mpegts.h" #include "libavformat/avlanguage.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" @@ -570,6 +571,11 @@ static int avi_write_packet(AVFormatContext *s, AVPacket *pkt) AVIStream *avist = s->streams[stream_index]->priv_data; AVCodecContext *enc = s->streams[stream_index]->codec; + if (enc->codec_id == AV_CODEC_ID_H264 && enc->codec_tag == MKTAG('H','2','6','4')) { + int ret = ff_check_h264_startcode(s, s->streams[stream_index], pkt); + if (ret < 0) + return ret; + } av_dlog(s, "dts:%s packet_count:%d stream_index:%d\n", av_ts2str(pkt->dts), avist->packet_count, stream_index); while (enc->block_align == 0 && pkt->dts != AV_NOPTS_VALUE && pkt->dts > avist->packet_count && enc->codec_id != AV_CODEC_ID_XSUB && avist->packet_count) { |
