For using autoupdate (both Andrea and I hit this err on newer autoconf)
Also attached my updated 'constify' patch for ffmpeg. C and fileffmpeg.C.
But not sure if I casted everything correctly...
diff --git a/cinelerra-5.1/autogen.sh b/cinelerra-5.1/autogen.sh
index f9eb0ddf..62031e80 100755
--- a/cinelerra-5.1/autogen.sh
+++ b/cinelerra-5.1/autogen.sh
@@ -7,6 +7,7 @@ rm -rf autom4te.cache m4
if [ "$1" = "clean" ]; then exit 0; fi
+autoupdate
mkdir m4
autoreconf --install
diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index df39763c..71258c72 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -404,7 +404,7 @@ int FFStream::decode_activate()
}
while( ret >= 0 && st != 0 && !reading ) {
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = 0;
+ const AVCodec *decoder = 0;
if( is_video() ) {
if( ffmpeg->opt_video_decoder )
decoder =
avcodec_find_decoder_by_name(ffmpeg->opt_video_decoder);
@@ -2089,7 +2089,7 @@ void FFMPEG::scan_audio_options(Asset *asset, EDL *edl)
cin_fmt = (int)av_get_sample_fmt(cin_sample_fmt);
if( cin_fmt < 0 ) {
char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
- AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio",
asset->acodec) ?
+ const AVCodec *av_codec = !FFMPEG::get_codec(audio_codec,
"audio", asset->acodec) ?
avcodec_find_encoder_by_name(audio_codec) : 0;
if( av_codec && av_codec->sample_fmts )
cin_fmt =
find_best_sample_fmt_of_list(av_codec->sample_fmts, AV_SAMPLE_FMT_FLT);
@@ -2125,7 +2125,7 @@ void FFMPEG::scan_video_options(Asset *asset, EDL *edl)
cin_fmt = (int)av_get_pix_fmt(cin_pix_fmt);
if( cin_fmt < 0 ) {
char video_codec[BCSTRLEN]; video_codec[0] = 0;
- AVCodec *av_codec = !get_codec(video_codec, "video",
asset->vcodec) ?
+ const AVCodec *av_codec = !get_codec(video_codec, "video",
asset->vcodec) ?
avcodec_find_encoder_by_name(video_codec) : 0;
if( av_codec && av_codec->pix_fmts ) {
if( 0 && edl ) { // frequently picks a bad answer
@@ -2322,7 +2322,7 @@ int FFCodecRemaps::add(const char *val)
int FFCodecRemaps::update(AVCodecID &codec_id, AVCodec *&decoder)
{
- AVCodec *codec = avcodec_find_decoder(codec_id);
+ const AVCodec *codec = avcodec_find_decoder(codec_id);
if( !codec ) return -1;
const char *name = codec->name;
FFCodecRemaps &map = *this;
@@ -2542,7 +2542,7 @@ int FFMPEG::init_decoder(const char *filename)
char *sp = strrchr(bp, '.');
if( !sp ) sp = bp + strlen(bp);
FILE *fp = 0;
- AVInputFormat *ifmt = 0;
+ const AVInputFormat *ifmt = 0;
if( sp ) {
strcpy(sp, ".opts");
fp = fopen(file_opts, "r");
@@ -2759,7 +2759,7 @@ int FFMPEG::open_encoder(const char *type, const char
*spec)
AVCodecContext *ctx = 0;
const AVCodecDescriptor *codec_desc = 0;
- AVCodec *codec = avcodec_find_encoder_by_name(codec_name);
+ const AVCodec *codec = avcodec_find_encoder_by_name(codec_name);
if( !codec ) {
eprintf(_("cant find codec %s:%s\n"), codec_name, filename);
ret = 1;
@@ -3651,7 +3651,7 @@ Preferences *FFMPEG::ff_prefs()
double FFVideoStream::get_rotation_angle()
{
int size = 0;
- int *matrix = (int*)av_stream_get_side_data(st,
AV_PKT_DATA_DISPLAYMATRIX, &size);
+ uint32_t *matrix = (uint32_t*)av_stream_get_side_data(st,
AV_PKT_DATA_DISPLAYMATRIX, &size);
int len = size/sizeof(*matrix);
if( !matrix || len < 5 ) return 0;
const double s = 1/65536.;
@@ -3875,7 +3875,7 @@ AVCodecContext *FFMPEG::activate_decoder(AVStream *st)
AVDictionary *copts = 0;
av_dict_copy(&copts, opts, 0);
AVCodecID codec_id = st->codecpar->codec_id;
- AVCodec *decoder = 0;
+ const AVCodec *decoder = 0;
switch( st->codecpar->codec_type ) {
case AVMEDIA_TYPE_VIDEO:
if( opt_video_decoder )
diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C
b/cinelerra-5.1/cinelerra/fileffmpeg.C
index a71d692a..8ac0a77d 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -159,7 +159,7 @@ void FFMpegPixelFormat::update_formats()
pixfmts.remove_all_objects();
char video_codec[BCSTRLEN]; video_codec[0] = 0;
const char *vcodec = vid_config->asset->vcodec;
- AVCodec *av_codec = !FFMPEG::get_codec(video_codec, "video", vcodec) ?
+ const AVCodec *av_codec = !FFMPEG::get_codec(video_codec, "video",
vcodec) ?
avcodec_find_encoder_by_name(video_codec) : 0;
const AVPixelFormat *pix_fmts = av_codec ? av_codec->pix_fmts : 0;
if( pix_fmts ) {
@@ -190,7 +190,7 @@ void FFMpegSampleFormat::update_formats()
samplefmts.remove_all_objects();
char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
const char *acodec = aud_config->asset->acodec;
- AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio", acodec) ?
+ const AVCodec *av_codec = !FFMPEG::get_codec(audio_codec, "audio",
acodec) ?
avcodec_find_encoder_by_name(audio_codec) : 0;
const AVSampleFormat *sample_fmts = av_codec ? av_codec->sample_fmts :
0;
if( sample_fmts ) {
@@ -1844,7 +1844,7 @@ int FFOptionsViewAudio::handle_event()
const char *name = asset->acodec;
char audio_format[BCSTRLEN]; audio_format[0] = 0;
char audio_codec[BCSTRLEN]; audio_codec[0] = 0;
- AVCodec *codec = !ret &&
+ const AVCodec *codec = !ret &&
!FFMPEG::get_format(audio_format, "audio", name) &&
!FFMPEG::get_codec(audio_codec, "audio", name) ?
avcodec_find_encoder_by_name(audio_codec) : 0;
@@ -1882,7 +1882,7 @@ int FFOptionsViewVideo::handle_event()
const char *name = asset->vcodec;
char video_format[BCSTRLEN]; video_format[0] = 0;
char video_codec[BCSTRLEN]; video_codec[0] = 0;
- AVCodec *codec = !ret &&
+ const AVCodec *codec = !ret &&
!FFMPEG::get_format(video_format, "video", name) &&
!FFMPEG::get_codec(video_codec, "video", name) ?
avcodec_find_encoder_by_name(video_codec) : 0;
--
Cin mailing list
Cin@lists.cinelerra-gg.org
https://lists.cinelerra-gg.org/mailman/listinfo/cin
