Merge remote-tracking branch 'qatar/master'
* 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:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- doc/APIchanges 6 additions, 0 deletionsdoc/APIchanges
- libavcodec/Makefile 1 addition, 1 deletionlibavcodec/Makefile
- libavcodec/adpcm.h 5 additions, 3 deletionslibavcodec/adpcm.h
- libavcodec/adpcmenc.c 41 additions, 34 deletionslibavcodec/adpcmenc.c
- libavcodec/avcodec.h 45 additions, 17 deletionslibavcodec/avcodec.h
- libavcodec/golomb-test.c 70 additions, 0 deletionslibavcodec/golomb-test.c
- libavcodec/h264.c 0 additions, 71 deletionslibavcodec/h264.c
- libavcodec/mpegaudiodec.c 3 additions, 4 deletionslibavcodec/mpegaudiodec.c
- libavcodec/options.c 1 addition, 1 deletionlibavcodec/options.c
- libavcodec/utils.c 31 additions, 13 deletionslibavcodec/utils.c
- libavcodec/wmalosslessdec.c 8 additions, 9 deletionslibavcodec/wmalosslessdec.c
- libavcodec/x86/Makefile 2 additions, 1 deletionlibavcodec/x86/Makefile
- libavcodec/x86/fmtconvert_mmx.c 1 addition, 1 deletionlibavcodec/x86/fmtconvert_mmx.c
- libavcodec/x86/rv40dsp.asm 207 additions, 0 deletionslibavcodec/x86/rv40dsp.asm
- libavcodec/x86/rv40dsp_init.c 21 additions, 2 deletionslibavcodec/x86/rv40dsp_init.c
- libavformat/Makefile 28 additions, 28 deletionslibavformat/Makefile
- libavformat/aacdec.c 2 additions, 2 deletionslibavformat/aacdec.c
- libavformat/ac3dec.c 2 additions, 2 deletionslibavformat/ac3dec.c
- libavformat/adxdec.c 2 additions, 2 deletionslibavformat/adxdec.c
- libavformat/avformat.h 86 additions, 47 deletionslibavformat/avformat.h
Loading
Please register or sign in to comment