aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-22 01:35:43 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-22 01:35:43 +0000
commitdbedf2aae26c44d3d310831dd1097900d5a539d9 (patch)
treeab0c29c986a7b48fe8671a9997403237a666384a /libavformat
parent0b459fb2d8d84f90d02a755a875ae921b2871020 (diff)
downloadffmpeg-dbedf2aae26c44d3d310831dd1097900d5a539d9.tar.gz
enable feeder threads
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ffmdec.c1
-rw-r--r--libavformat/ffmenc.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 37a60a55e5..8d0a39bc23 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -310,6 +310,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->frame_skip_cmp = get_be32(pb);
codec->rc_buffer_aggressivity = av_int2dbl(get_be64(pb));
codec->codec_tag = get_be32(pb);
+ codec->thread_count = get_byte(pb);
break;
case CODEC_TYPE_AUDIO:
codec->sample_rate = get_be32(pb);
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index 3b7c354841..1a38f9937f 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -158,6 +158,7 @@ static int ffm_write_header(AVFormatContext *s)
put_be32(pb, codec->frame_skip_cmp);
put_be64(pb, av_dbl2int(codec->rc_buffer_aggressivity));
put_be32(pb, codec->codec_tag);
+ put_byte(pb, codec->thread_count);
break;
case CODEC_TYPE_AUDIO:
put_be32(pb, codec->sample_rate);