« Previous | Next » 

Revision d46aada5

IDd46aada5c2c71b9b0a259e62699cab25837053b2
Parent 66b1f210, 5a153604
Child 33651e3e

Added by Michael Niedermayer about 9 years ago

Merge branch 'master' into oldabi

  • master: (403 commits)
    Initial caf muxer.
    Support decoding of amr_nb and gsm in caf.
    Fix decoding of msrle samples with 1bpp.
    udp: remove resource.h inclusion, it breaks mingw compilation.
    ffmpeg: Allow seting and cycling through debug modes.
    Fix FSF address copy paste error in some license headers.
    Add an aac sample which uses LTP to fate-aac.
    ffmpeg: Help for interactive keys.
    UDP: dont use thread_t as truth value.
    swscale: fix compile on mingw32
    [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
    arm: properly mark external symbol call
    ffmpeg: Interactivity support. Try pressing +-hs.
    swscale: 10l forgot git add this change from ronald.
    AVFrame: only set parameters from AVCodecContext in decode_video*() when no frame reordering is used.
    avcodec_default_get_buffer: init picture parameters.
    swscale: properly inline bits/endianness in yuv2yuvX16inC().
    swscale: fix clipping of 9/10bit YUV420P.
    Add av_clip_uintp2() function
    Support more QT 1bpp rawvideo files.
    ...

Conflicts:
libavcodec/flacenc.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/mpeg12.c
libavcodec/msrle.c
libavcodec/options.c
libavcodec/qpeg.c
libavcodec/rv34.c
libavcodec/svq1dec.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavcodec/version.h
libavfilter/avfilter.h
libavformat/file.c
libavformat/options.c
libavformat/rtpproto.c
libavformat/udp.c
libavutil/avutil.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted