projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5aad8e8
)
vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
author
Diego Biurrun
<diego@biurrun.de>
Fri, 13 Apr 2012 06:52:08 +0000
(08:52 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Mon, 14 May 2012 14:19:14 +0000
(16:19 +0200)
libavcodec/vcr1.c
patch
|
blob
|
history
diff --git
a/libavcodec/vcr1.c
b/libavcodec/vcr1.c
index 7edd801b8f078ea800fcac37c7760468f257f949..87b39b0527989e15099160238a51d5d32da8282a 100644
(file)
--- a/
libavcodec/vcr1.c
+++ b/
libavcodec/vcr1.c
@@
-151,6
+151,9
@@
AVCodec ff_vcr1_decoder = {
#define CONFIG_VCR1_ENCODER 0
#if CONFIG_VCR1_ENCODER
+
+#include "put_bits.h"
+
static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
int buf_size, void *data)
{
@@
-164,10
+167,9
@@
static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
p->key_frame = 1;
avpriv_align_put_bits(&a->pb);
- while (get_bit_count(&a->pb) & 31)
- put_bits(&a->pb, 8, 0);
+ flush_put_bits(&a->pb);
- size =
get_bit
_count(&a->pb) / 32;
+ size =
put_bits
_count(&a->pb) / 32;
return size * 4;
}