• Michael Niedermayer's avatar
    Merge commit 'a0cabd0a' · 8ab97a60
    Michael Niedermayer authored
    * commit 'a0cabd0a':
      mimic: cosmetics, reformat
      iff: drop ff_ prefix from a static function.
      pngdec: cosmetics, reformat.
      dxa: return meaningful error codes.
      eatgq: cosmetics, reformat.
    
    Conflicts:
    	libavcodec/dxa.c
    	libavcodec/eatgq.c
    	libavcodec/iff.c
    	libavcodec/mimic.c
    	libavcodec/pngdec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8ab97a60
iff.c 35 KB