generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: fix -force_key_frames

Browse Source 
Based on commit 19ad567311 in master.
This commit is contained in:
Anton Khirnov
2012-10-06 09:21:29 +02:00
parent 0054d70f23
commit a60eb6ef12
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg.c
View File

@@ -298,6 +298,7 @@ typedef struct AVOutputStream {
#endif #endif
int sws_flags; int sws_flags;
char *forced_key_frames;
} AVOutputStream; } AVOutputStream;
static AVOutputStream **output_streams_for_file[MAX_FILES] = { NULL }; static AVOutputStream **output_streams_for_file[MAX_FILES] = { NULL };
@@ -2254,6 +2255,9 @@ static int transcode(AVFormatContext **output_files,
} }
codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num};
if (ost->forced_key_frames)
parse_forced_key_frames(ost->forced_key_frames, ost, codec);
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (configure_video_filters(ist, ost)) { if (configure_video_filters(ist, ost)) {
fprintf(stderr, "Error opening filters!\n"); fprintf(stderr, "Error opening filters!\n");
@@ -2729,6 +2733,7 @@ static int transcode(AVFormatContext **output_files,
av_freep(&ost->st->codec->subtitle_header); av_freep(&ost->st->codec->subtitle_header);
av_free(ost->pict_tmp.data[0]); av_free(ost->pict_tmp.data[0]);
av_free(ost->forced_kf_pts); av_free(ost->forced_kf_pts);
av_free(ost->forced_key_frames);
if (ost->video_resample) if (ost->video_resample)
sws_freeContext(ost->img_resample_ctx); sws_freeContext(ost->img_resample_ctx);
if (ost->resample) if (ost->resample)
@@ -3550,8 +3555,10 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
} }
} }
if (forced_key_frames) if (forced_key_frames) {
parse_forced_key_frames(forced_key_frames, ost, video_enc); ost->forced_key_frames = forced_key_frames;
forced_key_frames = NULL;
}
} }
if (video_language) { if (video_language) {
av_dict_set(&st->metadata, "language", video_language, 0); av_dict_set(&st->metadata, "language", video_language, 0);
@@ -3561,7 +3568,6 @@ static void new_video_stream(AVFormatContext *oc, int file_idx)
/* reset some key parameters */ /* reset some key parameters */
video_disable = 0; video_disable = 0;
av_freep(&video_codec_name); av_freep(&video_codec_name);
av_freep(&forced_key_frames);
video_stream_copy = 0; video_stream_copy = 0;
frame_pix_fmt = PIX_FMT_NONE; frame_pix_fmt = PIX_FMT_NONE;
} }