mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-14 21:56:41 +01:00
98 lines
3.6 KiB
Diff
98 lines
3.6 KiB
Diff
diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C
|
|
index b762d46..53ad7a1 100644
|
|
--- a/cinelerra/ffmpeg.C
|
|
+++ b/cinelerra/ffmpeg.C
|
|
@@ -32,9 +32,9 @@ int FFMPEG::init(char *codec_string) {
|
|
return 1;
|
|
}
|
|
|
|
- context = avcodec_alloc_context();
|
|
+ context = avcodec_alloc_context3(codec);
|
|
|
|
- if (avcodec_open(context, codec)) {
|
|
+ if (avcodec_open2(context, codec,NULL)) {
|
|
printf("FFMPEG::init avcodec_open() failed\n");
|
|
}
|
|
|
|
diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C
|
|
index e56705f..119c2d5 100644
|
|
--- a/cinelerra/fileac3.C
|
|
+++ b/cinelerra/fileac3.C
|
|
@@ -91,11 +91,11 @@ int FileAC3::open_file(int rd, int wr)
|
|
eprintf("codec not found.\n");
|
|
return 1;
|
|
}
|
|
- codec_context = avcodec_alloc_context();
|
|
+ codec_context = avcodec_alloc_context3(codec);
|
|
codec_context->bit_rate = asset->ac3_bitrate * 1000;
|
|
codec_context->sample_rate = asset->sample_rate;
|
|
codec_context->channels = asset->channels;
|
|
- if(avcodec_open(codec_context, codec))
|
|
+ if(avcodec_open2(codec_context, codec,NULL))
|
|
{
|
|
eprintf("failed to open codec.\n");
|
|
return 1;
|
|
diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c
|
|
index 67bcab8..d78055e 100644
|
|
--- a/quicktime/mpeg4.c
|
|
+++ b/quicktime/mpeg4.c
|
|
@@ -640,7 +640,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
|
|
return 1;
|
|
}
|
|
|
|
- codec->encoder_context[current_field] = avcodec_alloc_context();
|
|
+ codec->encoder_context[current_field] = avcodec_alloc_context3(codec->encoder[current_field]);
|
|
AVCodecContext *context = codec->encoder_context[current_field];
|
|
|
|
context->width = width_i;
|
|
@@ -736,7 +736,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track)
|
|
* codec->fix_bitrate,
|
|
* codec->quantizer);
|
|
*/
|
|
- avcodec_open(context, codec->encoder[current_field]);
|
|
+ avcodec_open2(context, codec->encoder[current_field],NULL);
|
|
|
|
avcodec_get_frame_defaults(&codec->picture[current_field]);
|
|
|
|
diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c
|
|
index c808da7..522d23c 100644
|
|
--- a/quicktime/qtffmpeg.c
|
|
+++ b/quicktime/qtffmpeg.c
|
|
@@ -67,7 +67,9 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
|
|
return 0;
|
|
}
|
|
|
|
- AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
|
|
+ //AVCodecContext *context = ptr->decoder_context[i] = avcodec_alloc_context();
|
|
+ AVCodecContext *context = avcodec_alloc_context3(ptr->decoder[i]);
|
|
+ ptr->decoder_context[i] = context;
|
|
static char fake_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
|
|
context->width = ptr->width_i;
|
|
context->height = ptr->height_i;
|
|
@@ -93,8 +95,7 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus,
|
|
{
|
|
context->thread_count = cpus;
|
|
}
|
|
- if(avcodec_open(context,
|
|
- ptr->decoder[i]) < 0)
|
|
+ if(avcodec_open2(context, ptr->decoder[i], NULL) < 0)
|
|
{
|
|
printf("quicktime_new_ffmpeg: avcodec_open failed.\n");
|
|
quicktime_delete_ffmpeg(ptr);
|
|
diff --git a/quicktime/wma.c b/quicktime/wma.c
|
|
index f38bdce..4be0274 100644
|
|
--- a/quicktime/wma.c
|
|
+++ b/quicktime/wma.c
|
|
@@ -76,10 +76,10 @@ static int init_decode(quicktime_audio_map_t *track_map,
|
|
printf("init_decode: avcodec_find_decoder returned NULL.\n");
|
|
return 1;
|
|
}
|
|
- codec->decoder_context = avcodec_alloc_context();
|
|
+ codec->decoder_context = avcodec_alloc_context3(codec->decoder);
|
|
codec->decoder_context->sample_rate = trak->mdia.minf.stbl.stsd.table[0].sample_rate;
|
|
codec->decoder_context->channels = track_map->channels;
|
|
- if(avcodec_open(codec->decoder_context, codec->decoder) < 0)
|
|
+ if(avcodec_open2(codec->decoder_context, codec->decoder,NULL) < 0)
|
|
{
|
|
printf("init_decode: avcodec_open failed.\n");
|
|
return 1;
|