• Michael Niedermayer's avatar
    Merge commit '0a7005be' · 18884f15
    Michael Niedermayer authored
    * commit '0a7005be':
      rtpdec_xiph: fix function return type
      smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
      mpegvideo: remove write-only variable
      Use proper return values in case of missing features
      fate: add avstring test
      rangecoder-test: Set error message log level to error, instead of debug
    
    Conflicts:
    	libavcodec/aacdec.c
    	libavcodec/amrnbdec.c
    	libavcodec/mpegvideo.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    18884f15
rtpdec_xiph.c 12.9 KB