eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 14:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'

Browse Source 
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2016-06-21 22:40:56 +02:00
parent 00e122bc0f b7e64fba7f
commit a4403e49b9
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dvbsubdec.c
View File

@@ -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