Skip to content
Snippets Groups Projects
  • Michael Niedermayer's avatar
    329675cf
    Merge commit 'a1c525f7' · 329675cf
    Michael Niedermayer authored
    
    * commit 'a1c525f7':
      pcx: return meaningful error codes.
      tmv: return meaningful error codes.
      msrle: return meaningful error codes.
      cscd: return meaningful error codes.
      yadif: x86: fix build for compilers without aligned stack
      lavc: introduce the convenience function init_get_bits8
      lavc: check for overflow in init_get_bits
    
    Conflicts:
    	libavcodec/cscd.c
    	libavcodec/pcx.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    329675cf
    History
    Merge commit 'a1c525f7'
    Michael Niedermayer authored
    
    * commit 'a1c525f7':
      pcx: return meaningful error codes.
      tmv: return meaningful error codes.
      msrle: return meaningful error codes.
      cscd: return meaningful error codes.
      yadif: x86: fix build for compilers without aligned stack
      lavc: introduce the convenience function init_get_bits8
      lavc: check for overflow in init_get_bits
    
    Conflicts:
    	libavcodec/cscd.c
    	libavcodec/pcx.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>