1. 02 Jan, 2012 2 commits
    • Michael Niedermayer's avatar
      Revert "mpegvideo: Do not error out on default values of thread_count." · 157f29f9
      Michael Niedermayer authored
      This is not needed anymore.
      
      This reverts commit ca0350f4.
      157f29f9
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 41211483
      Michael Niedermayer authored
      * qatar/master:
        avconv: make -frames work for all types of streams, not just video.
        bfi: K&R cosmetics
        bgmc: K&R cleanup
        rawdec: Set start_time to 0 for raw audio files.
        Detect 'yuv2' as rawvideo also in avi.
        rawdec: propagate pict_type information to the output frame
        rawdec: Support more QT 1bpp rawvideo files.
        avconv: free bitstream filters
        threads: limit the number of automatic threads to MAX_AUTO_THREADS
        avplay: K&R cleanup
        fate: use rgb24 as output format for dfa tests
        threads: set thread_count to 1 when thread support is disabled
        threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264
      
      Conflicts:
      	ffplay.c
      	libavcodec/avcodec.h
      	libavcodec/pthread.c
      	libavcodec/version.h
      	tests/ref/fate/dfa1
      	tests/ref/fate/dfa10
      	tests/ref/fate/dfa11
      	tests/ref/fate/dfa2
      	tests/ref/fate/dfa3
      	tests/ref/fate/dfa4
      	tests/ref/fate/dfa5
      	tests/ref/fate/dfa6
      	tests/ref/fate/dfa7
      	tests/ref/fate/dfa8
      	tests/ref/fate/dfa9
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      41211483
  2. 01 Jan, 2012 30 commits
  3. 31 Dec, 2011 8 commits