• Michael Niedermayer's avatar
    Merge commit '9d46eaec' · db29a7c7
    Michael Niedermayer authored
    * commit '9d46eaec':
      build: The FLAC encoder also depends on the flacdsp code
      img2: K&R formatting cosmetics
      h264: check context state before decoding slice data partitions
      flashsv: make sure data for zlib priming is available
    
    Conflicts:
    	libavcodec/Makefile
    	libavformat/img2.c
    	libavformat/img2dec.c
    	libavformat/img2enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    db29a7c7
img2enc.c 5.75 KB