Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
authorClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:40:56 +0000 (22:40 +0200)
committerClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:40:56 +0000 (22:40 +0200)
commita4403e49b93a68f8c197615f346f2f891c35a4e5
treef478c7f50367730937be83aec4c9ae8a9ba4432a
parent00e122bc0f2a4d867797f593770f9902f275b864
parentb7e64fba7f37cc0399beae844f0a5dbef9219376
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'

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

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/dvbsubdec.c
libavcodec/mpegvideo_enc.c
libavcodec/pgssubdec.c
libavcodec/xsubdec.c
libavdevice/v4l2.c