Revision dbedf2aa

View differences:

ffmpeg.c
449 449
        else if (st->codec->codec_type == CODEC_TYPE_VIDEO && video_stream_copy)
450 450
            st->stream_copy = 1;
451 451

  
452
        if(!st->codec->thread_count)
453
            st->codec->thread_count = 1;
454
        if(st->codec->thread_count>1)
455
            avcodec_thread_init(st->codec, st->codec->thread_count);
456

  
452 457
        if(st->codec->flags & CODEC_FLAG_BITEXACT)
453 458
            nopts = 1;
454 459
    }
libavformat/ffmdec.c
310 310
            codec->frame_skip_cmp = get_be32(pb);
311 311
            codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
312 312
            codec->codec_tag = get_be32(pb);
313
            codec->thread_count = get_byte(pb);
313 314
            break;
314 315
        case CODEC_TYPE_AUDIO:
315 316
            codec->sample_rate = get_be32(pb);
libavformat/ffmenc.c
158 158
            put_be32(pb, codec->frame_skip_cmp);
159 159
            put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
160 160
            put_be32(pb, codec->codec_tag);
161
            put_byte(pb, codec->thread_count);
161 162
            break;
162 163
        case CODEC_TYPE_AUDIO:
163 164
            put_be32(pb, codec->sample_rate);
tests/libav.regression.ref
15 15
d6fdeb9f7083cc827f9510c6c4517dc0 *./tests/data/b-libav.swf
16 16
335771 ./tests/data/b-libav.swf
17 17
./tests/data/b-libav.swf CRC=0xe14e8847
18
bbdf0d67ad1035d59adc3c4cd245f3a9 *./tests/data/b-libav.ffm
18
102427263dc342610721d5754fac4d87 *./tests/data/b-libav.ffm
19 19
380928 ./tests/data/b-libav.ffm
20 20
./tests/data/b-libav.ffm CRC=0x2b71a386
21 21
f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv

Also available in: Unified diff