diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-13 17:54:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-13 17:54:10 +0000 |
| commit | 9c3d33d67f2260d5ddc888e8ea380c3913e38a72 (patch) | |
| tree | 46c82202d3f7c2964f7cace9e1131e97ada124bb /libavcodec/mpeg12.c | |
| parent | 7984082a08cf2119da3433c245b72a91020b879d (diff) | |
| download | ffmpeg-streaming-9c3d33d67f2260d5ddc888e8ea380c3913e38a72.zip ffmpeg-streaming-9c3d33d67f2260d5ddc888e8ea380c3913e38a72.tar.gz | |
multithreaded/SMP motion estimation
multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263
all pthread specific code is in pthread.c
to try it, run configure --enable-pthreads and ffmpeg ... -threads <num>
the internal thread API is a simple AVCodecContext.execute() callback which executes a given function pointer with different arguments and returns after finishing all, that way no mutexes or other thread-mess is needed outside pthread.c
Originally committed as revision 2772 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index a66ea13..0e47048 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -419,7 +419,9 @@ void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 8, 255); } put_bits(&s->pb, 2, s->intra_dc_precision); - put_bits(&s->pb, 2, s->picture_structure= PICT_FRAME); + + assert(s->picture_structure == PICT_FRAME); + put_bits(&s->pb, 2, s->picture_structure); if (s->progressive_sequence) { put_bits(&s->pb, 1, 0); /* no repeat */ } else { |
