• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 25b9eef4
    Michael Niedermayer authored
    * qatar/master:
      cljr: K&R cosmetics
      cljr: return a more sensible value when encountering invalid headers
      cljr: drop unnecessary emms_c() calls without MMX code
      cljr: remove useless casts
      cljr: group encode/decode parts under single ifdefs
      cljr: remove stray semicolon
      cljr: add missing return statement in decode_end()
      doc: add pulseaudio to the input list
      avconv: remove unsubstantiated comment
      shorten: avoid abort() on unknown audio types
      cljr: add encoder
      build: merge lists of HTML documentation targets
      tests/examples: Mark some variables only used within their files as static.
      tests/tools/examples: Replace direct exit() calls by return.
      x86 cpuid: set vendor union members separately
      cljr: release picture at end of decoding
      rv40: NEON optimised rv40 qpel motion compensation
    
    Conflicts:
    	doc/examples/muxing.c
    	libavcodec/cljr.c
    	libavcodec/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    25b9eef4
avconv.c 160 KB