« Previous | Next » 

Revision 9891004b

ID9891004ba91a126f56cd02c6f7a7b0c368a158b9
Parent a0f17473, 578d6861
Child d6f79edb

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
    Error out if vaapi is not found
    avio: undeprecate av_url_read_fseek/fpause under nicer names
    libvo-*: Don't use deprecated sample format names and enum names
    DUPLICATE flvdec: Fix support for flvtool2 "keyframes based" generated index
    DUPLICATE libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
    Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
    Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
configure
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/flvdec.c

Marged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted