Mercurial > libavcodec.hg

changeset 12517:be85455cab8f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix rv20 encoding so the binary decoder can decode it.
author michael
date Sun, 26 Sep 2010 01:56:48 +0000
parents 34beb0af8204
children 67e7e49058c2
files mpegvideo_enc.c rv20enc.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo_enc.c	Sat Sep 25 23:27:16 2010 +0000
+++ b/mpegvideo_enc.c	Sun Sep 26 01:56:48 2010 +0000
@@ -618,7 +618,7 @@
         s->h263_aic=1;
         s->h263_plus=1;
         s->loop_filter=1;
-        s->unrestricted_mv= s->obmc || s->loop_filter || s->umvplus;
+        s->unrestricted_mv= 0;
         break;
     case CODEC_ID_MPEG4:
         s->out_format = FMT_H263;
--- a/rv20enc.c	Sat Sep 25 23:27:16 2010 +0000
+++ b/rv20enc.c	Sun Sep 26 01:56:48 2010 +0000
@@ -41,7 +41,7 @@
     put_bits(&s->pb, 1, s->no_rounding);
 
     assert(s->f_code == 1);
-    assert(s->unrestricted_mv == 1);
+    assert(s->unrestricted_mv == 0);
     assert(s->alt_inter_vlc == 0);
     assert(s->umvplus == 0);
     assert(s->modified_quant==1);