• Michael Niedermayer's avatar
    Merge commit 'd8c772de' · cfc40a6a
    Michael Niedermayer authored
    * commit 'd8c772de':
      nutdec: Always return a value from nut_read_timestamp()
      configure: Make warnings from -Wreturn-type fatal errors
      x86: ABS2: port to cpuflags
      vdpau: Remove av_unused attribute from function declaration
      h264: fix ff_generate_sliding_window_mmcos() prototype.
    
    Conflicts:
    	configure
    	libavformat/nutdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cfc40a6a
h264.h 29 KB