diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 18:38:10 +0200 |
| commit | 999a99c865cc12cc69240029b8a280b5ba170b52 (patch) | |
| tree | 76716c81c74a7cac82b4a265b4f6c18b4ce2191f /libavformat/mux.c | |
| parent | e3c1d9a56c715223284d5bfbcad5cd1f78a798f9 (diff) | |
| parent | a312f71090ee620ee252f2034aef6b13e2dafe9c (diff) | |
Merge commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c'
* commit 'a312f71090ee620ee252f2034aef6b13e2dafe9c':
lavf: deprecate now unused AVStream.pts
Conflicts:
libavformat/mux.c
libavformat/version.h
mostly not merged as the code is needed for a/vsync drop handling
and what the code does is what is needed, it could maybe be moved
elsewhere or factored somehow but simply removing it would be droping
these features.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index a3a63f29a5..1d8fedcc11 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -435,7 +435,8 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) { int delay = FFMAX(st->codec->has_b_frames, st->codec->max_b_frames > 0); - int num, den, frame_size, i; + int num, den, i; + int frame_size; av_dlog(s, "compute_pkt_fields2: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); @@ -516,8 +517,6 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) case AVMEDIA_TYPE_VIDEO: frac_add(&st->pts, (int64_t)st->time_base.den * st->codec->time_base.num); break; - default: - break; } return 0; } |