1. 04 May, 2011 2 commits
  2. 03 May, 2011 2 commits
    • ami_stuff's avatar
      Remove lowres support from wmv2 decoder · c402ce41
      ami_stuff authored
      lowres option crashes with wmv2 files which I have for test,
      so I think it's better to remove the support to the time when
      lowres will be really supported by this codec
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      c402ce41
    • 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
  3. 02 May, 2011 19 commits
  4. 01 May, 2011 17 commits