virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavd/avfoundation: Using the actual stream index instead of hardcoded value.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Thilo Borgmann 2014-09-23 16:48:06 +02:00 committed by Michael Niedermayer
parent a69c70e148
commit 92827e1869
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/avfoundation.m
View File

@ -89,6 +89,7 @@ typedef struct
int list_devices;
int video_device_index;
int video_stream_index;
enum AVPixelFormat pixel_format;
AVCaptureSession *capture_session;
@ -295,6 +296,8 @@ static int get_video_config(AVFormatContext *s)
return 1;
}
ctx->video_stream_index = stream->index;
avpriv_set_pts_info(stream, 64, 1, avf_time_base);
CVImageBufferRef image_buffer = CMSampleBufferGetImageBuffer(ctx->current_frame);
@ -423,7 +426,7 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pts = pkt->dts = av_rescale_q(av_gettime() - ctx->first_pts,
AV_TIME_BASE_Q,
avf_time_base_q);
pkt->stream_index = 0;
pkt->stream_index = ctx->video_stream_index;
pkt->flags |= AV_PKT_FLAG_KEY;
CVPixelBufferLockBaseAddress(image_buffer, 0);