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 /libavdevice | |
| 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 'libavdevice')
| -rw-r--r-- | libavdevice/v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index c8915e0067..9153ad4302 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -971,9 +971,9 @@ fail: static int v4l2_read_packet(AVFormatContext *ctx, AVPacket *pkt) { - struct video_data *s = ctx->priv_data; #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS + struct video_data *s = ctx->priv_data; AVFrame *frame = ctx->streams[0]->codec->coded_frame; FF_ENABLE_DEPRECATION_WARNINGS #endif |