• Michael Niedermayer's avatar
    Merge commit '36ef5369' · 7a72695c
    Michael Niedermayer authored
    * commit '36ef5369':
      Replace all CODEC_ID_* with AV_CODEC_ID_*
      lavc: add AV prefix to codec ids.
    
    Conflicts:
    	doc/APIchanges
    	doc/examples/decoding_encoding.c
    	doc/examples/muxing.c
    	ffmpeg.c
    	ffprobe.c
    	ffserver.c
    	libavcodec/8svx.c
    	libavcodec/avcodec.h
    	libavcodec/dnxhd_parser.c
    	libavcodec/dvdsubdec.c
    	libavcodec/error_resilience.c
    	libavcodec/h263dec.c
    	libavcodec/libvorbisenc.c
    	libavcodec/mjpeg_parser.c
    	libavcodec/mjpegenc.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pcm.c
    	libavcodec/r210dec.c
    	libavcodec/utils.c
    	libavcodec/v210dec.c
    	libavcodec/version.h
    	libavdevice/alsa-audio-dec.c
    	libavdevice/bktr.c
    	libavdevice/v4l2.c
    	libavformat/asfdec.c
    	libavformat/asfenc.c
    	libavformat/avformat.h
    	libavformat/avidec.c
    	libavformat/caf.c
    	libavformat/electronicarts.c
    	libavformat/flacdec.c
    	libavformat/flvdec.c
    	libavformat/flvenc.c
    	libavformat/framecrcenc.c
    	libavformat/img2.c
    	libavformat/img2dec.c
    	libavformat/img2enc.c
    	libavformat/ipmovie.c
    	libavformat/isom.c
    	libavformat/matroska.c
    	libavformat/matroskadec.c
    	libavformat/matroskaenc.c
    	libavformat/mov.c
    	libavformat/movenc.c
    	libavformat/mp3dec.c
    	libavformat/mpeg.c
    	libavformat/mpegts.c
    	libavformat/mxf.c
    	libavformat/mxfdec.c
    	libavformat/mxfenc.c
    	libavformat/nsvdec.c
    	libavformat/nut.c
    	libavformat/oggenc.c
    	libavformat/pmpdec.c
    	libavformat/rawdec.c
    	libavformat/rawenc.c
    	libavformat/riff.c
    	libavformat/sdp.c
    	libavformat/utils.c
    	libavformat/vocenc.c
    	libavformat/wtv.c
    	libavformat/xmv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7a72695c
Name
Last commit
Last update
..
Makefile Loading commit data...
aac.h Loading commit data...
aacpsdsp_init_arm.c Loading commit data...
aacpsdsp_neon.S Loading commit data...
ac3dsp_arm.S Loading commit data...
ac3dsp_armv6.S Loading commit data...
ac3dsp_init_arm.c Loading commit data...
ac3dsp_neon.S Loading commit data...
asm-offsets.h Loading commit data...
dca.h Loading commit data...
dcadsp_init_arm.c Loading commit data...
dcadsp_neon.S Loading commit data...
dsputil_arm.S Loading commit data...
dsputil_arm.h Loading commit data...
dsputil_armv6.S Loading commit data...
dsputil_init_arm.c Loading commit data...
dsputil_init_armv5te.c Loading commit data...
dsputil_init_armv6.c Loading commit data...
dsputil_init_neon.c Loading commit data...
dsputil_init_vfp.c Loading commit data...
dsputil_neon.S Loading commit data...
dsputil_vfp.S Loading commit data...
fft_fixed_init_arm.c Loading commit data...
fft_fixed_neon.S Loading commit data...
fft_init_arm.c Loading commit data...
fft_neon.S Loading commit data...
fmtconvert_init_arm.c Loading commit data...
fmtconvert_neon.S Loading commit data...
fmtconvert_vfp.S Loading commit data...
h264cmc_neon.S Loading commit data...
h264dsp_init_arm.c Loading commit data...
h264dsp_neon.S Loading commit data...
h264idct_neon.S Loading commit data...
h264pred_init_arm.c Loading commit data...
h264pred_neon.S Loading commit data...
int_neon.S Loading commit data...
jrevdct_arm.S Loading commit data...
mathops.h Loading commit data...
mdct_fixed_neon.S Loading commit data...
mdct_neon.S Loading commit data...
mpegaudiodsp_fixed_armv6.S Loading commit data...
mpegaudiodsp_init_arm.c Loading commit data...
mpegvideo_arm.c Loading commit data...
mpegvideo_arm.h Loading commit data...
mpegvideo_armv5te.c Loading commit data...
mpegvideo_armv5te_s.S Loading commit data...
mpegvideo_neon.S Loading commit data...
neon.S Loading commit data...
rdft_neon.S Loading commit data...
rv34dsp_init_neon.c Loading commit data...
rv34dsp_neon.S Loading commit data...
rv40dsp_init_neon.c Loading commit data...
rv40dsp_neon.S Loading commit data...
sbrdsp_init_arm.c Loading commit data...
sbrdsp_neon.S Loading commit data...
simple_idct_arm.S Loading commit data...
simple_idct_armv5te.S Loading commit data...
simple_idct_armv6.S Loading commit data...
simple_idct_neon.S Loading commit data...
synth_filter_neon.S Loading commit data...
vp3dsp_init_arm.c Loading commit data...
vp3dsp_neon.S Loading commit data...
vp56_arith.h Loading commit data...
vp56dsp_init_arm.c Loading commit data...
vp56dsp_neon.S Loading commit data...
vp8.h Loading commit data...
vp8_armv6.S Loading commit data...
vp8dsp.h Loading commit data...
vp8dsp_armv6.S Loading commit data...
vp8dsp_init_arm.c Loading commit data...
vp8dsp_init_armv6.c Loading commit data...
vp8dsp_init_neon.c Loading commit data...
vp8dsp_neon.S Loading commit data...