diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-05-30 19:24:17 +0000 |
| commit | df5fbeb013e70f14090cec1998a5f923d6713a1d (patch) | |
| tree | de31c29919f53b88f27bdb7add18706b1b51ddcc /src/libffmpeg/libavcodec/msmpeg4.c | |
| parent | 26de73d1e48ab23af83e352cdc6e9eac41bf8c3b (diff) | |
| download | xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.gz xine-lib-df5fbeb013e70f14090cec1998a5f923d6713a1d.tar.bz2 | |
merge ffmpeg to fix compiler warnings
CVS patchset: 6612
CVS date: 2004/05/30 19:24:17
Diffstat (limited to 'src/libffmpeg/libavcodec/msmpeg4.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/msmpeg4.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/libffmpeg/libavcodec/msmpeg4.c b/src/libffmpeg/libavcodec/msmpeg4.c index c6cfebe16..7df276ca7 100644 --- a/src/libffmpeg/libavcodec/msmpeg4.c +++ b/src/libffmpeg/libavcodec/msmpeg4.c @@ -425,9 +425,7 @@ void msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) #ifdef DEBUG intra_count = 0; -/* printf("*****frame %d:\n", frame_count++); -*/ #endif } @@ -658,21 +656,6 @@ void msmpeg4_encode_mb(MpegEncContext * s, #endif //CONFIG_ENCODERS -/* old ffmpeg msmpeg4v3 mode */ -static void ff_old_msmpeg4_dc_scale(MpegEncContext * s) -{ - if (s->qscale < 5){ - s->y_dc_scale = 8; - s->c_dc_scale = 8; - }else if (s->qscale < 9){ - s->y_dc_scale = 2 * s->qscale; - s->c_dc_scale = (s->qscale + 13)>>1; - }else{ - s->y_dc_scale = s->qscale + 8; - s->c_dc_scale = (s->qscale + 13)>>1; - } -} - static inline int msmpeg4v1_pred_dc(MpegEncContext * s, int n, int32_t **dc_val_ptr) { |