• Michael Niedermayer's avatar
    Merge commit 'a312f710' · 999a99c8
    Michael Niedermayer authored
    * commit 'a312f710':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    999a99c8
version.h 2.97 KB