Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>

diff --cc Changelog
index 6ab3e84,ab4136a..e863a08
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -121,21 -102,38 +121,22 @@@ easier to use. The changes are
  - Discworld II BMV decoding support
  - VBLE Decoder
  - OS X Video Decoder Acceleration (VDA) support
 +- compact and csv output in ffprobe
 +- pan audio filter
 +- IFF Amiga Continuous Bitmap (ACBM) decoder
 +- ass filter
  - CRI ADX audio format demuxer
  - Playstation Portable PMP format demuxer
 +- Microsoft Windows ICO demuxer
 +- life source
  - PCM format support in OMA demuxer
+ - CLJR encoder
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 -
 -
 -version 0.7_beta2:
 +version 0.8:
  
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
  
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc avconv.c
Simple merge

diff --cc doc/examples/muxing.c
index 6f88517,a1702cd..e72bfac
--- 1/doc/examples/muxing.c
--- 2/libavformat/output-example.c
+++ b/doc/examples/muxing.c
@@@ -459,16 -450,26 +459,16 @@@ int main(int argc, char **argv
  
      filename = argv[1];
  
 -    /* auto detect the output format from the name. default is
 -       mpeg. */
 -    fmt = av_guess_format(NULL, filename, NULL);
 -    if (!fmt) {
 +    /* allocate the output media context */
 +    avformat_alloc_output_context2(&oc, NULL, NULL, filename);
 +    if (!oc) {
          printf("Could not deduce output format from file extension: using MPEG.\n");
 -        fmt = av_guess_format("mpeg", NULL, NULL);
 -    }
 -    if (!fmt) {
 -        fprintf(stderr, "Could not find suitable output format\n");
 -        return 1;
 +        avformat_alloc_output_context2(&oc, NULL, "mpeg", filename);
      }
 -
 -    /* allocate the output media context */
 -    oc = avformat_alloc_context();
      if (!oc) {
-         exit(1);
 -        fprintf(stderr, "Memory error\n");
+         return 1;
      }
 -    oc->oformat = fmt;
 -    snprintf(oc->filename, sizeof(oc->filename), "%s", filename);
 +    fmt = oc->oformat;
  
      /* add the audio and video streams using the default format codecs
         and initialize the codecs */

diff --cc doc/general.texi
Simple merge

diff --cc libavcodec/allcodecs.c
Simple merge

diff --cc libavcodec/cljr.c
index 53ab40c,65b7433..183652b
--- 1/libavcodec/cljr.c
--- 2/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@@ -25,18 -25,25 +25,26 @@@
   */
  
  #include "avcodec.h"
- #include "dsputil.h"
  #include "get_bits.h"
+ #include "put_bits.h"
  
- /* Disable the encoder. */
- #undef CONFIG_CLJR_ENCODER
- #define CONFIG_CLJR_ENCODER 0
- 
- typedef struct CLJRContext{
+ typedef struct CLJRContext {
      AVCodecContext *avctx;
-     AVFrame picture;
+     AVFrame         picture;
  } CLJRContext;
  
+ static av_cold int common_init(AVCodecContext *avctx)
+ {
+     CLJRContext * const a = avctx->priv_data;
+ 
++    avcodec_get_frame_defaults(&a->picture);
+     avctx->coded_frame = &a->picture;
+     a->avctx = avctx;
+ 
+     return 0;
+ }
+ 
+ #if CONFIG_CLJR_DECODER
  static int decode_frame(AVCodecContext *avctx,
                          void *data, int *data_size,
                          AVPacket *avpkt)

diff --cc libavcodec/dct-test.c
Simple merge

diff --cc libavcodec/fft-test.c
Simple merge

diff --cc libavcodec/motion-test.c
Simple merge

diff --cc libavcodec/shorten.c
Simple merge

diff --cc libavcodec/version.h
index 9042e26,a41234f..0e2c58e
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,8 -21,8 +21,8 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 41
- #define LIBAVCODEC_VERSION_MICRO  2
 -#define LIBAVCODEC_VERSION_MINOR 27
++#define LIBAVCODEC_VERSION_MINOR 42
+ #define LIBAVCODEC_VERSION_MICRO  0
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \

diff --cc libavformat/riff.c
Simple merge

diff --cc libavformat/seek-test.c
Simple merge

diff --cc libavutil/adler32.c
Simple merge

diff --cc libavutil/x86/cpu.c
Simple merge