• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 2525821f
    Michael Niedermayer authored
    * qatar/master:
      vp8: frame-multithreading.
    Duplicate  Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
    Duplicate  Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
    Bug spoted&removed in last merge:  dpx: Do not use DPX encoder for decoding.
    
    Conflicts:
    	ffmpeg.c
    	ffplay.c
    	libavcodec/h264.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo_enc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2525821f
vp8.c 63.2 KB