changeset 2328:7b5353eb0dd8 libavcodec

cleanup
author michael
date Thu, 28 Oct 2004 12:12:33 +0000
parents 5e5cf598a48b
children bae9c6de090b
files h261.c
diffstat 1 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/h261.c	Thu Oct 28 10:12:57 2004 +0000
+++ b/h261.c	Thu Oct 28 12:12:33 2004 +0000
@@ -77,7 +77,7 @@
     s->dsp.h261_loop_filter(dest_cr, uvlinesize);
 }
 
-int ff_h261_get_picture_format(int width, int height){
+static int ff_h261_get_picture_format(int width, int height){
     // QCIF
     if (width == 176 && height == 144)
         return 0;
@@ -93,16 +93,10 @@
                               int n);
 static int h261_decode_block(H261Context *h, DCTELEM *block,
                              int n, int coded);
-static int h261_decode_mb(H261Context *h);
-void ff_set_qscale(MpegEncContext * s, int qscale);
 
 void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){
     H261Context * h = (H261Context *) s;
-    int format, coded_frame_rate, coded_frame_rate_base, temp_ref;
-    int best_clock_code=1;
-    int best_divisor=60;
-    coded_frame_rate= 1800000;
-    coded_frame_rate_base= (1000+best_clock_code)*best_divisor;
+    int format, temp_ref;
 
     align_put_bits(&s->pb);
 
@@ -111,8 +105,8 @@
 
     put_bits(&s->pb, 20, 0x10); /* PSC */
 
-    temp_ref= s->picture_number * (int64_t)coded_frame_rate * s->avctx->frame_rate_base / 
-                         (coded_frame_rate_base * (int64_t)s->avctx->frame_rate);
+    temp_ref= s->picture_number * (int64_t)30000 * s->avctx->frame_rate_base / 
+                         (1001 * (int64_t)s->avctx->frame_rate);
     put_bits(&s->pb, 5, temp_ref & 0x1f); /* TemporalReference */
 
     put_bits(&s->pb, 1, 0); /* split screen off */