Attachment #346314 for bug #443214

View | Details | Raw Unified | Return to bug 443214
Collapse All | Expand All

Lines 109-115 void probe_ffmpeg(info_t *ipipe) Link Here

(-)./import/probe_ffmpeg.c.original (-1 / +1 lines)
109	return;	109	return;
110	}	110	}
111		111
112	ret = av_find_stream_info(lavf_dmx_context);	112	ret = avformat_find_stream_info(lavf_dmx_context, NULL);
113	if (ret < 0) {	113	if (ret < 0) {
114	tc_log_error(__FILE__, "unable to fetch informations from '%s'"	114	tc_log_error(__FILE__, "unable to fetch informations from '%s'"
115	" (libavformat failure)",	115	" (libavformat failure)",

Lines 170-176 void decode_lavc(decode_t *decode) Link Here

(-)./import/decode_lavc.c.original (-2 / +2 lines)
170		170
171	// Set these to the expected values so that ffmpeg's decoder can	171	// Set these to the expected values so that ffmpeg's decoder can
172	// properly detect interlaced input.	172	// properly detect interlaced input.
173	lavc_dec_context = avcodec_alloc_context();	173	lavc_dec_context = avcodec_alloc_context3(NULL);
174	if (lavc_dec_context == NULL) {	174	if (lavc_dec_context == NULL) {
175	tc_log_error(__FILE__, "Could not allocate enough memory.");	175	tc_log_error(__FILE__, "Could not allocate enough memory.");
176	goto decoder_error;	176	goto decoder_error;
Lines 186-192 void decode_lavc(decode_t *decode) Link Here
186	lavc_dec_context->error_concealment = 3;	186	lavc_dec_context->error_concealment = 3;
187	lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;	187	lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
188		188
189	if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {	189	if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
190	tc_log_error(__FILE__, "Could not initialize the '%s' codec.",	190	tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
191	codec->name);	191	codec->name);
192	goto decoder_error;	192	goto decoder_error;

Return to bug 443214