1. 24 Nov, 2011 3 commits
    • Sergiy Gur'yev's avatar
    • Michael Niedermayer's avatar
      ffmpeg: rewrite vsync / notimestamps handling · 957867ab
      Michael Niedermayer authored
      The qatar implementation makes no sense.
      a muxer without timestamps is constant fps thus needs vsync.
      the crc/mp5 are special cases that have timestamps yet allow any
      nonsensical timestamps.
      raw (yuv/rgb) video is constant fps thus needs vsync too.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      957867ab
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 8e576d58
      Michael Niedermayer authored
      * qatar/master:
        libavutil: add utility functions to simplify allocation of audio buffers.
        libavutil: add planar sample formats and av_sample_fmt_is_planar()
        avconv: fix segfault at EOF with delayed pictures
        pcmdec: remove unneeded resetting of samples pointer
        avconv: remove a now unused parameter from output_packet().
        avconv: formatting fixes in output_packet()
        avconv: declare some variables in blocks where they are used
        avconv: use the same behavior when decoding audio/video/subs
        bethsoftvideo: return proper consumed size for palette packets.
        cdg: skip packets that don't contain a cdg command.
        crcenc: add flags
        avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
        tiffenc: add a private option for selecting compression algorithm
        md5enc: add flags
        ARM: remove needless .text/.align directives
      
      Conflicts:
      	doc/APIchanges
      	libavcodec/tiffenc.c
      	libavutil/avutil.h
      	libavutil/samplefmt.c
      	libavutil/samplefmt.h
      	tests/ref/fate/bethsoft-vid
      	tests/ref/fate/cdgraphics
      	tests/ref/fate/film-cvid-pcm-stereo-8bit
      	tests/ref/fate/mpeg2-field-enc
      	tests/ref/fate/nuv
      	tests/ref/fate/tiertex-seq
      	tests/ref/fate/tscc-32bit
      	tests/ref/fate/vmnc-32bit
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      8e576d58
  2. 23 Nov, 2011 28 commits
  3. 22 Nov, 2011 9 commits