• Michael Niedermayer's avatar
    Merge commit '84f2847d' · 7b018e5c
    Michael Niedermayer authored
    * commit '84f2847d':
      xl: return a meaningful error code.
      xan: return a meaningful error code.
      xxan: return meaningful error codes.
      zmbv: return more meaningful error codes.
      yop: use a meaningful error code.
      c93: return meaningful error codes.
      bmv: return meaningful error codes.
      bmp: return meaningful error codes.
      bink: operate with pointers to AVFrames instead of whole structs.
      bink: return meaningful error codes.
      bfi: return meaningful error codes.
      bethsoftvideo: return meaningful error codes.
    
    Conflicts:
    	libavcodec/c93.c
    	libavcodec/xl.c
    	libavcodec/xxan.c
    	libavcodec/yop.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7b018e5c
zmbv.c 19.7 KB