[opencv] 55/98: Backport PR #3813 to 2.4

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit 9a5d7f1a0b1c481ff285c0c482842f9c7a316071
Author: Roman Donchenko <roman.donchenko at itseez.com>
Date:   Tue Mar 15 14:13:31 2016 +0300

    Backport PR #3813 to 2.4
    
    It has already been partially backported by #6199; this commit completes
    the backport.
---
 modules/highgui/src/cap_ffmpeg_impl.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index 6df542a..f761638 100644
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -853,8 +853,6 @@ bool CvCapture_FFMPEG::grabFrame()
         frame_number > ic->streams[video_stream]->nb_frames )
         return false;
 
-    av_free_packet (&packet);
-
     picture_pts = AV_NOPTS_VALUE_;
 
     // get the next frame
@@ -917,8 +915,6 @@ bool CvCapture_FFMPEG::grabFrame()
             if (count_errs > max_number_of_attempts)
                 break;
         }
-
-        av_free_packet (&packet);
     }
 
     if( valid && first_frame_number < 0 )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git