blob: 3989d3d83aa7795343bb364bbfb08706c9a47f8e (
plain)
1 --- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200
2 +++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200
3 @@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
4 return;
5 }
6
7 - ret = av_find_stream_info(lavf_dmx_context);
8 + ret = avformat_find_stream_info(lavf_dmx_context, NULL);
9 if (ret < 0) {
10 tc_log_error(__FILE__, "unable to fetch informations from '%s'"
11 " (libavformat failure)",
12 --- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200
13 +++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200
14 @@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
15
16 // Set these to the expected values so that ffmpeg's decoder can
17 // properly detect interlaced input.
18 - lavc_dec_context = avcodec_alloc_context();
19 + lavc_dec_context = avcodec_alloc_context3(NULL);
20 if (lavc_dec_context == NULL) {
21 tc_log_error(__FILE__, "Could not allocate enough memory.");
22 goto decoder_error;
23 @@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
24 lavc_dec_context->error_concealment = 3;
25 lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
26
27 - if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
28 + if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
29 tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
30 codec->name);
31 goto decoder_error;
|
