• 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
Name
Last commit
Last update
..
examples Loading commit data...
APIchanges Loading commit data...
Makefile Loading commit data...
RELEASE_NOTES Loading commit data...
avconv.texi Loading commit data...
avtools-common-opts.texi Loading commit data...
avutil.txt Loading commit data...
bitstream_filters.texi Loading commit data...
build_system.txt Loading commit data...
decoders.texi Loading commit data...
demuxers.texi Loading commit data...
developer.texi Loading commit data...
encoders.texi Loading commit data...
eval.texi Loading commit data...
faq.texi Loading commit data...
fate.txt Loading commit data...
ffmpeg-mt-authorship.txt Loading commit data...
ffmpeg.texi Loading commit data...
ffmpeg.txt Loading commit data...
ffplay.texi Loading commit data...
ffprobe.texi Loading commit data...
ffserver.conf Loading commit data...
ffserver.texi Loading commit data...
filters.texi Loading commit data...
general.texi Loading commit data...
git-howto.txt Loading commit data...
indevs.texi Loading commit data...
issue_tracker.txt Loading commit data...
libavfilter.texi Loading commit data...
metadata.texi Loading commit data...
multithreading.txt Loading commit data...
muxers.texi Loading commit data...
optimization.txt Loading commit data...
outdevs.texi Loading commit data...
protocols.texi Loading commit data...
rate_distortion.txt Loading commit data...
snow.txt Loading commit data...
soc.txt Loading commit data...
swresample.txt Loading commit data...
swscale.txt Loading commit data...
t2h.init Loading commit data...
tablegen.txt Loading commit data...
texi2pod.pl Loading commit data...
viterbi.txt Loading commit data...