virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

ffplay: use new avformat_open_* API.

Browse Source
This commit is contained in:
Anton Khirnov 2011-06-09 10:58:23 +02:00 committed by Michael Niedermayer
parent c9584f0c9c
commit b6bde8c770
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ffplay.c
View File

@ -27,6 +27,7 @@
#include "libavutil/colorspace.h" #include "libavutil/colorspace.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/dict.h"
#include "libavutil/parseutils.h" #include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
@ -2295,15 +2296,13 @@ static int decode_interrupt_cb(void)
static int read_thread(void *arg) static int read_thread(void *arg)
{ {
VideoState *is = arg; VideoState *is = arg;
AVFormatContext *ic; AVFormatContext *ic = NULL;
int err, i, ret; int err, i, ret;
int st_index[AVMEDIA_TYPE_NB]; int st_index[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
AVFormatParameters params, *ap = &params;
int eof=0; int eof=0;
int pkt_in_play_range = 0; int pkt_in_play_range = 0;
AVDictionaryEntry *t;
ic = avformat_alloc_context();
memset(st_index, -1, sizeof(st_index)); memset(st_index, -1, sizeof(st_index));
is->video_stream = -1; is->video_stream = -1;
@ -2313,30 +2312,17 @@ static int read_thread(void *arg)
global_video_state = is; global_video_state = is;
avio_set_interrupt_cb(decode_interrupt_cb); avio_set_interrupt_cb(decode_interrupt_cb);
memset(ap, 0, sizeof(*ap)); err = avformat_open_input(&ic, is->filename, is->iformat, &format_opts);
ap->prealloced_context = 1;
ap->width = frame_width;
ap->height= frame_height;
ap->time_base= (AVRational){1, 25};
ap->pix_fmt = frame_pix_fmt;
ic->flags |= AVFMT_FLAG_PRIV_OPT;
err = av_open_input_file(&ic, is->filename, is->iformat, 0, ap);
if (err >= 0) {
set_context_opts(ic, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL);
err = av_demuxer_open(ic, ap);
if(err < 0){
avformat_free_context(ic);
ic= NULL;
}
}
if (err < 0) { if (err < 0) {
print_error(is->filename, err); print_error(is->filename, err);
ret = -1; ret = -1;
goto fail; goto fail;
} }
if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
ret = AVERROR_OPTION_NOT_FOUND;
goto fail;
}
is->ic = ic; is->ic = ic;
if(genpts) if(genpts)