virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avformat/avisynth: Fix off-by-one error in avisynth demuxer.

Browse Source 
Fixes ticket #2412.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
d s 2013-04-09 15:36:58 -07:00 committed by Michael Niedermayer
parent d0073c7a0b
commit ca3cef719e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/avisynth.c
View File

@ -409,14 +409,14 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, int dis
AVS_VideoFrame *frame; AVS_VideoFrame *frame;
unsigned char* dst_p; unsigned char* dst_p;
const unsigned char* src_p; const unsigned char* src_p;
int i, plane, rowsize, planeheight, pitch, bits; int n, i, plane, rowsize, planeheight, pitch, bits;
const char* error; const char* error;
if (avs->curr_frame >= avs->vi->num_frames) if (avs->curr_frame >= avs->vi->num_frames)
return AVERROR_EOF; return AVERROR_EOF;
// This must happen even if the stream is discarded to prevent desync. // This must happen even if the stream is discarded to prevent desync.
avs->curr_frame++; n = avs->curr_frame++;
if (discard) if (discard)
return 0; return 0;
@ -445,7 +445,7 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt, int dis
if (!pkt->data) if (!pkt->data)
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
frame = avs_library->avs_get_frame(avs->clip, avs->curr_frame); frame = avs_library->avs_get_frame(avs->clip, n);
error = avs_library->avs_clip_get_error(avs->clip); error = avs_library->avs_clip_get_error(avs->clip);
if (error) { if (error) {
av_log(s, AV_LOG_ERROR, "%s\n", error); av_log(s, AV_LOG_ERROR, "%s\n", error);
@ -480,6 +480,7 @@ static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt, int dis
AviSynthContext *avs = s->priv_data; AviSynthContext *avs = s->priv_data;
AVRational fps, samplerate; AVRational fps, samplerate;
int samples; int samples;
int64_t n;
const char* error; const char* error;
if (avs->curr_sample >= avs->vi->num_audio_samples) if (avs->curr_sample >= avs->vi->num_audio_samples)
@ -510,6 +511,7 @@ static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt, int dis
samples = avs->vi->num_audio_samples - avs->curr_sample; samples = avs->vi->num_audio_samples - avs->curr_sample;
// This must happen even if the stream is discarded to prevent desync. // This must happen even if the stream is discarded to prevent desync.
n = avs->curr_sample;
avs->curr_sample += samples; avs->curr_sample += samples;
if (discard) if (discard)
return 0; return 0;
@ -525,7 +527,7 @@ static int avisynth_read_packet_audio(AVFormatContext *s, AVPacket *pkt, int dis
if (!pkt->data) if (!pkt->data)
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
avs_library->avs_get_audio(avs->clip, pkt->data, avs->curr_sample, samples); avs_library->avs_get_audio(avs->clip, pkt->data, n, samples);
error = avs_library->avs_clip_get_error(avs->clip); error = avs_library->avs_clip_get_error(avs->clip);
if (error) { if (error) {
av_log(s, AV_LOG_ERROR, "%s\n", error); av_log(s, AV_LOG_ERROR, "%s\n", error);