generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffprobe: drop dependancy on sizeof(AVFrame)

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-17 16:27:36 +01:00
parent b8f4410ff6
commit bf1c87ee7a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffprobe.c
View File

@ -1853,7 +1853,7 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx,
const ReadInterval *interval, int64_t *cur_ts) const ReadInterval *interval, int64_t *cur_ts)
{ {
AVPacket pkt, pkt1; AVPacket pkt, pkt1;
AVFrame frame; AVFrame *frame = NULL;
int ret = 0, i = 0, frame_count = 0; int ret = 0, i = 0, frame_count = 0;
int64_t start = -INT64_MAX, end = interval->end; int64_t start = -INT64_MAX, end = interval->end;
int has_start = 0, has_end = interval->has_end && !interval->end_is_offset; int has_start = 0, has_end = interval->has_end && !interval->end_is_offset;
@ -1887,6 +1887,7 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx,
} }
} }
frame = av_frame_alloc();
while (!av_read_frame(fmt_ctx, &pkt)) { while (!av_read_frame(fmt_ctx, &pkt)) {
if (selected_streams[pkt.stream_index]) { if (selected_streams[pkt.stream_index]) {
AVRational tb = fmt_ctx->streams[pkt.stream_index]->time_base; AVRational tb = fmt_ctx->streams[pkt.stream_index]->time_base;
@ -1919,7 +1920,7 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx,
} }
if (do_read_frames) { if (do_read_frames) {
pkt1 = pkt; pkt1 = pkt;
while (pkt1.size && process_frame(w, fmt_ctx, &frame, &pkt1) > 0); while (pkt1.size && process_frame(w, fmt_ctx, frame, &pkt1) > 0);
} }
} }
av_free_packet(&pkt); av_free_packet(&pkt);
@ -1931,10 +1932,11 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx,
for (i = 0; i < fmt_ctx->nb_streams; i++) { for (i = 0; i < fmt_ctx->nb_streams; i++) {
pkt.stream_index = i; pkt.stream_index = i;
if (do_read_frames) if (do_read_frames)
while (process_frame(w, fmt_ctx, &frame, &pkt) > 0); while (process_frame(w, fmt_ctx, frame, &pkt) > 0);
} }
end: end:
av_frame_free(&frame);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Could not read packets in interval "); av_log(NULL, AV_LOG_ERROR, "Could not read packets in interval ");
log_read_interval(interval, NULL, AV_LOG_ERROR); log_read_interval(interval, NULL, AV_LOG_ERROR);