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

In case of stream copy, copy the extradata from the input codec context to

Browse Source 
the output codec context (instead of just copying a pointer to the extradata).

Originally committed as revision 23538 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2010-06-08 19:27:29 +00:00
parent 8764389d47
commit b659c8b4b7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ffmpeg.c
View File

@ -2156,6 +2156,11 @@ static int av_transcode(AVFormatContext **output_files,
codec->chroma_sample_location = icodec->chroma_sample_location; codec->chroma_sample_location = icodec->chroma_sample_location;
if (ost->st->stream_copy) { if (ost->st->stream_copy) {
uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE;
if (extra_size > INT_MAX)
goto fail;
/* if stream_copy is selected, no need to decode or encode */ /* if stream_copy is selected, no need to decode or encode */
codec->codec_id = icodec->codec_id; codec->codec_id = icodec->codec_id;
codec->codec_type = icodec->codec_type; codec->codec_type = icodec->codec_type;
@ -2168,7 +2173,10 @@ static int av_transcode(AVFormatContext **output_files,
} }
codec->bit_rate = icodec->bit_rate; codec->bit_rate = icodec->bit_rate;
codec->extradata= icodec->extradata; codec->extradata= av_mallocz(extra_size);
if (!codec->extradata)
goto fail;
memcpy(codec->extradata, icodec->extradata, icodec->extradata_size);
codec->extradata_size= icodec->extradata_size; codec->extradata_size= icodec->extradata_size;
if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){ if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){
codec->time_base = icodec->time_base; codec->time_base = icodec->time_base;
@ -2682,6 +2690,8 @@ static int av_transcode(AVFormatContext **output_files,
for(i=0;i<nb_ostreams;i++) { for(i=0;i<nb_ostreams;i++) {
ost = ost_table[i]; ost = ost_table[i];
if (ost) { if (ost) {
if (ost->st->stream_copy)
av_freep(&ost->st->codec->extradata);
if (ost->logfile) { if (ost->logfile) {
fclose(ost->logfile); fclose(ost->logfile);
ost->logfile = NULL; ost->logfile = NULL;