diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-06 18:10:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-07 11:11:56 +0200 |
| commit | 207d78176f868555ed7b5db4eb6ec9af9d3f700d (patch) | |
| tree | a6511f7723ad3fd6245c2945d792cf74e47551e2 | |
| parent | ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d (diff) | |
| download | ffmpeg-207d78176f868555ed7b5db4eb6ec9af9d3f700d.tar.gz | |
avformat: Export ticks_per_frame in st->codec
Fixes regressions with stream copy and output timebase/fps being twice as fine as needed
Makes the timebase and ticks per frame handled identical which should make the
code easier to understand and work with. It does not solve the problem without
st->codec access
Suggested-by: Hendrik Leppkes
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/utils.c | 4 | ||||
| -rw-r--r-- | tests/ref/fate/copy-trac4914 | 4 | ||||
| -rw-r--r-- | tests/ref/fate/copy-trac4914-avi | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 7d23c4ae47..76cbff4ef6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3825,8 +3825,10 @@ FF_DISABLE_DEPRECATION_WARNINGS st->codec->height = st->internal->avctx->height; } - if (st->codec->codec_tag != MKTAG('t','m','c','d')) + if (st->codec->codec_tag != MKTAG('t','m','c','d')) { st->codec->time_base = st->internal->avctx->time_base; + st->codec->ticks_per_frame = st->internal->avctx->ticks_per_frame; + } st->codec->framerate = st->avg_frame_rate; if (st->internal->avctx->subtitle_header) { diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914 index 9301c86346..c977f30396 100644 --- a/tests/ref/fate/copy-trac4914 +++ b/tests/ref/fate/copy-trac4914 @@ -1,2 +1,2 @@ -84316a64b609052d9974891686fbf607 *tests/data/fate/copy-trac4914.mxf -566329 tests/data/fate/copy-trac4914.mxf +8868ae16d99ed03916e9dc7105285471 *tests/data/fate/copy-trac4914.mxf +560697 tests/data/fate/copy-trac4914.mxf diff --git a/tests/ref/fate/copy-trac4914-avi b/tests/ref/fate/copy-trac4914-avi index e23affcd9e..0ee66754a2 100644 --- a/tests/ref/fate/copy-trac4914-avi +++ b/tests/ref/fate/copy-trac4914-avi @@ -1,2 +1,2 @@ -e948f10c90f526ae2c0cf234e1f54128 *tests/data/fate/copy-trac4914-avi.avi -480886 tests/data/fate/copy-trac4914-avi.avi +26e4202638bc384b82d2b5eb4d33a5f0 *tests/data/fate/copy-trac4914-avi.avi +479494 tests/data/fate/copy-trac4914-avi.avi |