• Michael Niedermayer's avatar
    Merge commit '7f9f771e' · a94eba6f
    Michael Niedermayer authored
    * commit '7f9f771e':
      avcodec: Don't anonymously typedef structs
    
    Conflicts:
    	libavcodec/alac.c
    	libavcodec/cinepak.c
    	libavcodec/cscd.c
    	libavcodec/dcadec.c
    	libavcodec/g723_1.c
    	libavcodec/gif.c
    	libavcodec/iff.c
    	libavcodec/kgv1dec.c
    	libavcodec/libopenjpegenc.c
    	libavcodec/libspeexenc.c
    	libavcodec/ra288.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a94eba6f
cook.c 44.4 KB