1. 23 Nov, 2011 4 commits
    • Michael Niedermayer's avatar
      vf_mp: rewrite vf_mp filter warning message · 4d874fc2
      Michael Niedermayer authored
      Warning text by: Clément Bœsch <ubitux@gmail.com>
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      4d874fc2
    • Michael Niedermayer's avatar
      avfilter: dont write out of array for duplicate formats in avfilter_merge_formats() · 8cda755c
      Michael Niedermayer authored
      Note, this is a theoretical fix, iam not aware of a case where this function receives
      duplicates in its input.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      8cda755c
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 0b9a69f2
      Michael Niedermayer authored
      * qatar/master: (22 commits)
        aacdec: Fix PS in ADTS.
        avconv: Consistently use PIX_FMT_NONE.
        dsputil: use cpuflags in x86 emu_edge_core
        dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
        wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
        mov: Remove some redundant and obsolete comments.
        Add libavutil/mathematics.h #includes for INFINITY
        doxy: structure libavformat groups
        doxy: introduce an empty structure in libavcodec
        doxy: provide a start page and document libavutil
        doxy: cleanup pixfmt.h
        regtest: split video encode/decode tests into individual targets
        ARM: add explicit .arch and .fpu directives to asm.S
        pthread: do not touch has_b_frames
        avconv: cleanup the transcoding loop in output_packet().
        avconv: split subtitle transcoding out of output_packet().
        avconv: split video transcoding out of output_packet().
        avconv: split audio transcoding out of output_packet().
        avconv: reindent.
        avconv: move streamcopy-only code out of decoding loop.
        ...
      
      Conflicts:
      	avconv.c
      	libavcodec/aaccoder.c
      	libavcodec/pthread.c
      	libavcodec/version.h
      	libavutil/audioconvert.h
      	libavutil/avutil.h
      	libavutil/mem.h
      	tests/ref/vsynth1/dv
      	tests/ref/vsynth1/mpeg2thread
      	tests/ref/vsynth2/dv
      	tests/ref/vsynth2/mpeg2thread
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      0b9a69f2
    • Lou Logan's avatar
      patcheck: spelling and grammar nits · a8e6d4d4
      Lou Logan authored
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a8e6d4d4
  2. 22 Nov, 2011 21 commits
  3. 21 Nov, 2011 15 commits