Merged the trunk r8542:8544

modules/highgui/src/cap.cpp

@@ -494,19 +494,16 @@ bool VideoCapture::retrieve(Mat& image, int channel)
 
 bool VideoCapture::read(Mat& image)
 {
-    if(!grab())
-        image.release();
-    else
+    if(grab())
         retrieve(image);
+    else
+        image.release();
     return !image.empty();
 }
     
 VideoCapture& VideoCapture::operator >> (Mat& image)
 {
-    if(!grab())
-        image.release();
-    else
-        retrieve(image);
+    read(image);
     return *this;
 }
     

modules/highgui/src/cap_ffmpeg_impl.hpp

@@ -438,6 +438,10 @@ bool CvCapture_FFMPEG::grabFrame()
     const int max_number_of_attempts = 1 << 16;
 
     if( !ic || !video_st )  return false;
+    
+    if( ic->streams[video_stream]->nb_frames > 0 &&
+        frame_number > ic->streams[video_stream]->nb_frames )
+        return false;
 
     av_free_packet (&packet);
     

modules/highgui/src/cap_qtkit.mm

@@ -316,7 +316,9 @@ int CvCaptureCAM::startCaptureDevice(int cameraNum) {
 	capture = [[CaptureDelegate alloc] init]; 
 	
 	QTCaptureDevice *device; 
-	NSArray* devices = [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo];
+    NSArray* devices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]
+	        arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
+	
 	if ([devices count] == 0) {
 		cout << "QTKit didn't find any attached Video Input Devices!" << endl; 
 		[localpool drain];