• Michael Niedermayer's avatar
    Merge commit 'c3e15f7b' · e3a91c51
    Michael Niedermayer authored
    * commit 'c3e15f7b':
      rtpdec: Don't pass a non-AVClass pointer as log context
      rtsp: Update a comment to the current filename scheme
      avcodec: handle AVERROR_EXPERIMENTAL
      avutil: Add AVERROR_EXPERIMENTAL
      avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL
    
    Conflicts:
    	doc/APIchanges
    	ffmpeg.c
    	libavcodec/utils.c
    	libavformat/rtpdec.c
    	libavutil/error.c
    	libavutil/error.h
    	libavutil/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e3a91c51
version.h 3.72 KB