• Michael Niedermayer's avatar
    Merge commit 'c2cb01d4' · c4bf7402
    Michael Niedermayer authored
    * commit 'c2cb01d4':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c4bf7402
ffmenc.c 8.95 KB