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/pgssubdec.c | |
| parent | 00e122bc0f2a4d867797f593770f9902f275b864 (diff) | |
| parent | b7e64fba7f37cc0399beae844f0a5dbef9219376 (diff) | |
| download | ffmpeg-a4403e49b93a68f8c197615f346f2f891c35a4e5.tar.gz | |
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/pgssubdec.c')
| -rw-r--r-- | libavcodec/pgssubdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 880fc96282..cef477d8c2 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -529,8 +529,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data, } for (i = 0; i < ctx->presentation.object_count; i++) { PGSSubObject *object; - AVSubtitleRect *rect; - int j; sub->rects[i] = av_mallocz(sizeof(*sub->rects[0])); if (!sub->rects[i]) { @@ -597,11 +595,15 @@ static int display_end_segment(AVCodecContext *avctx, void *data, #if FF_API_AVPICTURE FF_DISABLE_DEPRECATION_WARNINGS +{ + AVSubtitleRect *rect; + int j; rect = sub->rects[i]; 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 } |