« Previous | Next » 

Revision 2fd41c90

ID2fd41c9067fc67b40f80e9cbd4787018009040db
Parent 00dc0206, 4ec153bb
Child 0cd13834

Added by Michael Niedermayer over 9 years ago

Merge remote-tracking branch 'newdev/master'

  • newdev/master:
    avio: make udp_set_remote_url/get_local_port internal.
    asfdec: also subtract preroll when reading simple index object
    matroskaenc: remove a variable that's unused after bc17bd9.
    avio: cosmetics - nicer vertical alignment.
    Remove unnecessary icc version checks
    Disable 'attribute "foo" ignored' warnings from icc
    rtsp: Don't use a locale dependent format string
    Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
    configure: get libavcodec version from new version.h header
    lavc: move the version macros to a new installed header.
    matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
    Do not use format string "%0.3f" for RTSP Range field.
    Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
    Document usage of import libraries created by dlltool
    configure: Set the correct lib target for arm/wince dlltool
    fate: simplify regression-funcs.sh
    fate: add support for multithread testing

Conflicts:
libavformat/rtspdec.c
libavutil/attributes.h
libavutil/internal.h
libavutil/mem.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted