diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-09-01 16:48:45 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-09-21 15:39:28 +0200 |
| commit | 955b818cf947473ec94a3fe8aa7f408b119fbbc9 (patch) | |
| tree | 0a68f841bd63243e17d202b7252cce5f6c7ca42b /libavformat/utils.c | |
| parent | 187c4273351f517a343c00ac470e1952edbd2e9b (diff) | |
| download | ffmpeg-955b818cf947473ec94a3fe8aa7f408b119fbbc9.tar.gz | |
ffmpeg: switch to codecpar
This commit is largely based on commit 15e84ed3 from Anton Khirnov
<anton@khirnov.net> which was previously skipped in bbf5ef9d.
There are still a bunch of things raising codecpar related warnings that
need fixing, such as:
- the use of codec->debug in the interactive debug mode
- read_ffserver_streams(): it's probably broken now but there is no test
- lowres stuff
- codec copy apparently required by bitstream filters
The matroska references are updated because they now properly forward
the field_order (previously unknown, now progressive).
Thanks to James Almer for fixing a bunch of FATE issues in this commit.
Signed-off-by: Clément Bœsch <clement@stupeflix.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index f043baec4d..a9bd03424c 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -5339,7 +5339,7 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, } } - if (enc_ctx->codec_tag == AV_RL32("tmcd") + if ((enc_ctx->codec_tag == AV_RL32("tmcd") || ost->codecpar->codec_tag == AV_RL32("tmcd")) && dec_ctx->time_base.num < dec_ctx->time_base.den && dec_ctx->time_base.num > 0 && 121LL*dec_ctx->time_base.num > dec_ctx->time_base.den) { |