aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-06-05 15:51:20 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-06-05 15:51:20 +0000
commit8d204aa4156940c15b4f8e8bc0ac979f630273c9 (patch)
tree913db3bdff2df9f168f68080813ea556c6a9d94f
parent69d93a13442b18d8b2326c1466931dc84fa866e6 (diff)
downloadffmpeg-8d204aa4156940c15b4f8e8bc0ac979f630273c9.tar.gz
10l (dont read variables before they have been set)
Originally committed as revision 4355 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 95d420fdd9..c0540fcc25 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2998,18 +2998,6 @@ static int decode_init(AVCodecContext *avctx){
s->low_delay= 1;
avctx->pix_fmt= PIX_FMT_YUV420P;
- if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
- memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
- memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t));
- }else{
- int i;
- for(i=0; i<16; i++){
-#define T(x) (x>>2) | ((x<<2) & 0xF)
- h->zigzag_scan[i] = T(zigzag_scan[i]);
- h-> field_scan[i] = T( field_scan[i]);
- }
- }
-
decode_init_vlc(h);
if(avctx->extradata_size > 0 && avctx->extradata &&
@@ -4173,6 +4161,18 @@ static int decode_slice_header(H264Context *h){
if (!s->context_initialized) {
if (MPV_common_init(s) < 0)
return -1;
+
+ if(s->dsp.h264_idct_add == ff_h264_idct_add_c){ //FIXME little ugly
+ memcpy(h->zigzag_scan, zigzag_scan, 16*sizeof(uint8_t));
+ memcpy(h-> field_scan, field_scan, 16*sizeof(uint8_t));
+ }else{
+ int i;
+ for(i=0; i<16; i++){
+#define T(x) (x>>2) | ((x<<2) & 0xF)
+ h->zigzag_scan[i] = T(zigzag_scan[i]);
+ h-> field_scan[i] = T( field_scan[i]);
+ }
+ }
alloc_tables(h);