summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avplay.c6
-rw-r--r--libavcodec/pthread.c3
-rw-r--r--libavdevice/dv1394.h3
3 files changed, 7 insertions, 5 deletions
diff --git a/avplay.c b/avplay.c
index c01e446ab0..e9389ffe65 100644
--- a/avplay.c
+++ b/avplay.c
@@ -2608,13 +2608,13 @@ static void stream_cycle_channel(VideoState *is, int codec_type)
static void toggle_full_screen(void)
{
- is_full_screen = !is_full_screen;
#if defined(__APPLE__) && SDL_VERSION_ATLEAST(1, 2, 14)
/* OS X needs to empty the picture_queue */
- for (int i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++) {
+ int i;
+ for (i = 0; i < VIDEO_PICTURE_QUEUE_SIZE; i++)
cur_stream->pictq[i].reallocate = 1;
- }
#endif
+ is_full_screen = !is_full_screen;
video_open(cur_stream);
}
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 88d8ade57e..c7edb9ec81 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -865,6 +865,7 @@ error:
void ff_thread_flush(AVCodecContext *avctx)
{
+ int i;
FrameThreadContext *fctx = avctx->thread_opaque;
if (!avctx->thread_opaque) return;
@@ -880,7 +881,7 @@ void ff_thread_flush(AVCodecContext *avctx)
fctx->next_decoding = fctx->next_finished = 0;
fctx->delaying = 1;
fctx->prev_thread = NULL;
- for (int i = 0; i < avctx->thread_count; i++) {
+ for (i = 0; i < avctx->thread_count; i++) {
PerThreadContext *p = &fctx->threads[i];
// Make sure decode flush calls with size=0 won't return old frames
p->got_frame = 0;
diff --git a/libavdevice/dv1394.h b/libavdevice/dv1394.h
index 5ccc68a259..fc4df24032 100644
--- a/libavdevice/dv1394.h
+++ b/libavdevice/dv1394.h
@@ -175,7 +175,8 @@
if(status.dropped_frames > 0) {
reset_dv1394();
} else {
- for(int i = 0; i < status.n_clear_frames; i++) {
+ int i;
+ for (i = 0; i < status.n_clear_frames; i++) {
copy_DV_frame();
}
}