• Michael Niedermayer's avatar
    Merge commit 'c0329748' · b0554fec
    Michael Niedermayer authored
    * commit 'c0329748':
      fate: add a dependency helper macro
      Add support for building shared libraries with MSVC
      avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
      gxf: Add a local copy of the relevant parts of the frame rate table
      configure: Split out msvc as a separate target OS
      aviobuf: Remove a senseless ifdef in avio_seek
    
    Conflicts:
    	configure
    	libavcodec/dirac.c
    	libavcodec/mpeg12data.h
    	libavcodec/mpeg12enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    b0554fec
internal.h 5.18 KB