• Michael Niedermayer's avatar
    Merge commit '596e5d47' · 96e6447d
    Michael Niedermayer authored
    * commit '596e5d47':
      lavf: Add a flag to enable/disable per-packet flushing
    
    Conflicts:
    	libavformat/avformat.h
    	libavformat/mux.c
    	libavformat/version.h
    
    This adds a 2nd API to set per packet flushing
    If the user application indicates through either a non default then this non default takes
    precedence over the other still default value
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    96e6447d
avformat.h 80.6 KB