• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a369a6b8
    Michael Niedermayer authored
    * qatar/master: (29 commits)
      fate: add golomb-test
      golomb-test: K&R formatting cosmetics
      h264: Split h264-test off into a separate file - golomb-test.c.
      h264-test: cleanup: drop timer invocations, commented out code and other cruft
      h264-test: Remove unused DSP and AVCodec contexts and related init calls.
      adpcm: Add missing stdint.h #include to fix standalone header compilation.
      lavf: add functions for accessing the fourcc<->CodecID mapping tables.
      lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
      lavc: make avcodec_close() work properly on unopened codecs.
      lavc: add avcodec_is_open().
      lavf: rename AVInputFormat.value to raw_codec_id.
      lavf: remove the pointless value field from flv and iv8
      lavc/lavf: remove unnecessary symbols from the symbol version script.
      lavc: reorder AVCodec fields.
      lavf: reorder AVInput/OutputFormat fields.
      mp3dec: Fix a heap-buffer-overflow
      adpcmenc: remove some unneeded casts
      adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
      adpcmenc: fix adpcm_ms extradata allocation
      adpcmenc: return proper AVERROR codes instead of -1
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/Makefile
    	libavcodec/adpcmenc.c
    	libavcodec/avcodec.h
    	libavcodec/h264.c
    	libavcodec/libavcodec.v
    	libavcodec/mpc7.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/options.c
    	libavformat/Makefile
    	libavformat/avformat.h
    	libavformat/flvdec.c
    	libavformat/libavformat.v
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a369a6b8
fmtconvert_mmx.c 5.59 KB