diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2005-06-09 20:01:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-06-09 20:01:02 +0000 |
| commit | 7dc1bea30ff4b9c0970345c9c82155dc43682c6e (patch) | |
| tree | 7f7d84c45ca01e2ed38622a86c6aab6d5a663b3b | |
| parent | 41061adf495ad435d08454d7e9534a4ee462aecb (diff) | |
| download | ffmpeg-7dc1bea30ff4b9c0970345c9c82155dc43682c6e.tar.gz | |
non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
Originally committed as revision 4368 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavformat/avienc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c0540fcc25..977ce5f297 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7343,7 +7343,7 @@ static int decode_frame(AVCodecContext *avctx, } if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){ - if(0 < decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) ) + if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0) return -1; } diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 2e647feeda..2e2ad71517 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -77,6 +77,7 @@ void end_tag(ByteIOContext *pb, offset_t start) important if multiple tags possible for a given codec. */ const CodecTag codec_bmp_tags[] = { { CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, + { CODEC_ID_H264, MKTAG('V', 'S', 'S', 'H') }, { CODEC_ID_H263, MKTAG('H', '2', '6', '3') }, { CODEC_ID_H263P, MKTAG('H', '2', '6', '3') }, |