« Previous | Next » 

Revision 2525821f

ID2525821f1aadf34e3c874c669feb6be27249e881
Parent 7d70d193, 4773d904
Child c402ce41

Added by Michael Niedermayer about 9 years ago

Merge remote branch 'qatar/master'

  • 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: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted