Mercurial > libavcodec.hg
diff mpegvideo.c @ 1116:86a5d0ce86bf libavcodec
merging fourcc with codec_tag
| author | michaelni |
|---|---|
| date | Sat, 08 Mar 2003 01:40:52 +0000 |
| parents | 1e39f273ecd6 |
| children | 64c7c76ed17c |
line wrap: on
line diff
--- a/mpegvideo.c Fri Mar 07 13:49:10 2003 +0000 +++ b/mpegvideo.c Sat Mar 08 01:40:52 2003 +0000 @@ -339,10 +339,10 @@ yc_size = y_size + 2 * c_size; /* convert fourcc to upper case */ - s->avctx->fourcc= toupper( s->avctx->fourcc &0xFF) - + (toupper((s->avctx->fourcc>>8 )&0xFF)<<8 ) - + (toupper((s->avctx->fourcc>>16)&0xFF)<<16) - + (toupper((s->avctx->fourcc>>24)&0xFF)<<24); + s->avctx->codec_tag= toupper( s->avctx->codec_tag &0xFF) + + (toupper((s->avctx->codec_tag>>8 )&0xFF)<<8 ) + + (toupper((s->avctx->codec_tag>>16)&0xFF)<<16) + + (toupper((s->avctx->codec_tag>>24)&0xFF)<<24); CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17;