• Michael Niedermayer's avatar
    Merge commit '1470ce21' · 9023de34
    Michael Niedermayer authored
    * commit '1470ce21':
      Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
      G.723.1 demuxer and decoder
      Add a shift parameter to celp_lp_synthesis_filter()
      libopenjpeg: K&R formatting cosmetics
      yadif: use emms_c() instead of inline assembly for emms invocations.
      ac3: don't use different names for option tables in the template file.
      lavfi: use const for AVFilterPad declarations in all filters.
      adpcm: don't duplicate identical AVSampleFmt array for each encoder.
      configure: cosmetics: Group test dependencies together
      configure: add more passthrough flags in tms470 filter
      configure: move flag filtering functions out of if/else blocks
    
    Conflicts:
    	Changelog
    	configure
    	doc/general.texi
    	libavcodec/Makefile
    	libavcodec/ac3enc_fixed.c
    	libavcodec/allcodecs.c
    	libavcodec/eac3enc.c
    	libavcodec/g723_1.c
    	libavcodec/g723_1_data.h
    	libavcodec/libopenjpegdec.c
    	libavcodec/libopenjpegenc.c
    	libavcodec/v210dec.h
    	libavcodec/version.h
    	libavfilter/af_anull.c
    	libavfilter/asrc_anullsrc.c
    	libavfilter/f_settb.c
    	libavfilter/fifo.c
    	libavfilter/split.c
    	libavfilter/src_movie.c
    	libavfilter/vf_aspect.c
    	libavfilter/vf_blackframe.c
    	libavfilter/vf_boxblur.c
    	libavfilter/vf_copy.c
    	libavfilter/vf_crop.c
    	libavfilter/vf_cropdetect.c
    	libavfilter/vf_delogo.c
    	libavfilter/vf_drawbox.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_fade.c
    	libavfilter/vf_fieldorder.c
    	libavfilter/vf_format.c
    	libavfilter/vf_frei0r.c
    	libavfilter/vf_gradfun.c
    	libavfilter/vf_hflip.c
    	libavfilter/vf_hqdn3d.c
    	libavfilter/vf_libopencv.c
    	libavfilter/vf_lut.c
    	libavfilter/vf_null.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_pixdesctest.c
    	libavfilter/vf_scale.c
    	libavfilter/vf_select.c
    	libavfilter/vf_setpts.c
    	libavfilter/vf_showinfo.c
    	libavfilter/vf_slicify.c
    	libavfilter/vf_transpose.c
    	libavfilter/vf_unsharp.c
    	libavfilter/vf_vflip.c
    	libavfilter/vf_yadif.c
    	libavfilter/vsrc_color.c
    	libavfilter/vsrc_testsrc.c
    	libavformat/Makefile
    	libavformat/allformats.c
    	libavformat/g723_1.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9023de34
libopenjpegdec.c 13.8 KB