This situation was created in merge commit 71d008ebe4f96974433eecfd3575bc82eb4b06a8.
Unified · Split
| @@ -2095,7 +2095,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, · 2094 unmodified lines | |||
| 2095 | static void mpeg_decode_user_data(AVCodecContext *avctx, | 2095 | static void mpeg_decode_user_data(AVCodecContext *avctx, |
| 2096 | const uint8_t *p, int buf_size) | 2096 | const uint8_t *p, int buf_size) |
| 2097 | { | 2097 | { |
| 2098 | Mpeg1Context *s = avctx->priv_data; | ||
| 2099 | const uint8_t *buf_end = p + buf_size; | 2098 | const uint8_t *buf_end = p + buf_size; |
| 2100 | Mpeg1Context *s1 = avctx->priv_data; | 2099 | Mpeg1Context *s1 = avctx->priv_data; |
| 2101 | 2100 | ||
| @@ -2111,7 +2110,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, · 9 unmodified lines | |||
| 2111 | int i; | 2110 | int i; |
| 2112 | for(i=0; i<20; i++) | 2111 | for(i=0; i<20; i++) |
| 2113 | if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ | 2112 | if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ |
| 2114 | s->tmpgexs= 1; | 2113 | s1->tmpgexs = 1; |
| 2115 | } | 2114 | } |
| 2116 | } | 2115 | } |
| 2117 | /* we parse the DTG active format information */ | 2116 | /* we parse the DTG active format information */ |