eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 02:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'

Browse Source 
* commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8':
  lavf: deprecate compute_pkt_fields2

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-11-11 14:37:48 +01:00
parent c03ffe1712 8de1ee9f72
commit 611c22140a
5 changed files with 108 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/utils.c
View File

@@ -3669,6 +3669,8 @@ static void free_stream(AVStream **pst)
if (st->attached_pic.data)
av_packet_unref(&st->attached_pic);
av_freep(&st->internal);
av_dict_free(&st->metadata);
av_freep(&st->probe_data.buf);
av_freep(&st->index_entries);
@@ -3785,6 +3787,11 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
av_free(st);
return NULL;
}
st->internal = av_mallocz(sizeof(*st->internal));
if (!st->internal)
goto fail;
if (s->iformat) {
/* no default bitrate if decoding */
st->codec->bit_rate = 0;
@@ -3825,6 +3832,9 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c)
s->streams[s->nb_streams++] = st;
return st;
fail:
free_stream(&st);
return NULL;
}
AVProgram *av_new_program(AVFormatContext *ac, int id)