Skip to content

O
opencv
Commit 559dfa29 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #3813 from hahne:iss1915

parents a035d391 1af45212
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/videoio/src/cap_ffmpeg_impl.hpp
View file @ 559dfa29
...@@ -657,13 +657,13 @@ bool CvCapture_FFMPEG::grabFrame() ...@@ -657,13 +657,13 @@ bool CvCapture_FFMPEG::grabFrame()
frame_number > ic->streams[video_stream]->nb_frames ) frame_number > ic->streams[video_stream]->nb_frames )
return false; return false;
av_free_packet (&packet);
picture_pts = AV_NOPTS_VALUE_; picture_pts = AV_NOPTS_VALUE_;
// get the next frame // get the next frame
while (!valid) while (!valid)
{ {
av_free_packet (&packet);
int ret = av_read_frame(ic, &packet); int ret = av_read_frame(ic, &packet);
if (ret == AVERROR(EAGAIN)) continue; if (ret == AVERROR(EAGAIN)) continue;
...@@ -706,8 +706,6 @@ bool CvCapture_FFMPEG::grabFrame() ...@@ -706,8 +706,6 @@ bool CvCapture_FFMPEG::grabFrame()
if (count_errs > max_number_of_attempts) if (count_errs > max_number_of_attempts)
break; break;
} }
av_free_packet (&packet);
} }
if( valid && first_frame_number < 0 ) if( valid && first_frame_number < 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment