diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 22:40:56 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 22:40:56 +0200 |
| commit | a4403e49b93a68f8c197615f346f2f891c35a4e5 (patch) | |
| tree | f478c7f50367730937be83aec4c9ae8a9ba4432a /libavcodec/dvbsubdec.c | |
| parent | 00e122bc0f2a4d867797f593770f9902f275b864 (diff) | |
| parent | b7e64fba7f37cc0399beae844f0a5dbef9219376 (diff) | |
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index a4663d997f..e9f4765b15 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -827,7 +827,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou AVSubtitleRect *rect; DVBSubCLUT *clut; uint32_t *clut_table; - int i,j; + int i; int offset_x=0, offset_y=0; int ret = 0; @@ -924,10 +924,13 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou #if FF_API_AVPICTURE FF_DISABLE_DEPRECATION_WARNINGS +{ + int j; for (j = 0; j < 4; j++) { rect->pict.data[j] = rect->data[j]; rect->pict.linesize[j] = rect->linesize[j]; } +} FF_ENABLE_DEPRECATION_WARNINGS #endif |