aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2003-10-13 08:02:46 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2003-10-13 08:02:46 +0000
commitc58222c56caf409244bb493db4fa9199d908db50 (patch)
treecc0cb88c803b275756e69e81e0c500880dce677a /libavcodec
parent431f2172cd3b0e7f0d84094769d954eef18bf154 (diff)
downloadffmpeg-c58222c56caf409244bb493db4fa9199d908db50.tar.gz
10l
Originally committed as revision 2368 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c2
-rw-r--r--libavcodec/wmv2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8bf9970368..f186fc26b2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4256,7 +4256,7 @@ int main(){
}
- init_put_bits(&pb, temp, SIZE, NULL, NULL);
+ init_put_bits(&pb, temp, SIZE);
printf("testing signed exp golomb\n");
for(i=0; i<COUNT; i++){
START_TIMER
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c
index b0f0838d02..f686648206 100644
--- a/libavcodec/wmv2.c
+++ b/libavcodec/wmv2.c
@@ -64,7 +64,7 @@ static int encode_ext_header(Wmv2Context *w){
PutBitContext pb;
int code;
- init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size, NULL, NULL);
+ init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size);
put_bits(&pb, 5, s->avctx->frame_rate / s->avctx->frame_rate_base); //yes 29.97 -> 29
put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));