diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 10:47:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-26 10:59:45 +0200 |
| commit | c4bf74022562036bac3f53f4d5b8b1787d904c24 (patch) | |
| tree | cd4fe28c3ddd2c5a33bf92e470a7c40ddbe7b76a /libavformat/framecrcenc.c | |
| parent | 05f4c0506198548c2e93e2029763008383ab48ca (diff) | |
| parent | c2cb01d418dd18e1cf997c038d37378d773121be (diff) | |
Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'
* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
lavf: introduce AVFMT_TS_NEGATIVE
Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts
This commit does not change the default ts behaviour, such
change will, if its done, be done separately.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/framecrcenc.c')
| -rw-r--r-- | libavformat/framecrcenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index df0ae79330..f63113b06e 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -56,5 +56,6 @@ AVOutputFormat ff_framecrc_muxer = { .video_codec = AV_CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framecrc_write_packet, - .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, + .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | + AVFMT_TS_NEGATIVE, }; |