« Previous | Next » 

Revision d4b98d47

IDd4b98d475f8abf9f05ebe91b3fce341aa4b902ee
Parent 8d8962ca, 1a9f9f81
Child 66b1f210

Added by Michael Niedermayer over 9 years ago

Merge commit '1a9f9f8' into oldabi

  • commit '1a9f9f8': (98 commits)
    Do not drop packets with no valid ->pos set as e.g. DV-in-AVI produces.
    FFMPEG: support demuxer specific options. Signed-off-by: Michael Niedermayer <>
    AVIDEC: use_odmc demuxer specific option. (mostly an exmaple for demuxer specific options) Signed-off-by: Michael Niedermayer <>
    LAVFAPI: demuxer specific options. (someone please add doxy) Signed-off-by: Michael Niedermayer <>
    output_example: use avformat_alloc_output_context() Signed-off-by: Michael Niedermayer <>
    LAVFAPI: avformat_alloc_output_context() / simplify usage of muxers. Signed-off-by: Michael Niedermayer <>
    LAVF API: remove AVOutputFormat.set_parameters() the field is unused. Signed-off-by: Michael Niedermayer <>
    CrystalHD: Add auto-detection of packed b-frame bug.
    lavc: remove disabled avcodec_decode_video() code
    Read the album_artist, grouping and lyrics metadata.
    In libx264 wrapper, change wpredp to a codec specific option.
    AMV: disable DR1 and don't override EMU_EDGE
    lavf: inspect more frames for fps when container time base is coarse
    Fix races in default av_log handler
    flashsv2enc: regression test. Signed-off-by: Michael Niedermayer <>
    vorbis: Replace sized int_fast integer types with plain int/unsigned.
    Remove disabled non-optimized code variants.
    bswap.h: Remove disabled code.
    Remove some disabled printf debug cruft.
    Replace more disabled printf() calls by av_dlog().
    ...

Conflicts:
libavcodec/options.c
libavcodec/qpeg.c
libavfilter/avfilter.h
libavformat/avformat.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted