Merge commit 'def97856'
* commit 'def97856': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>
No related branches found
No related tags found
Showing
- cmdutils.c 11 additions, 11 deletionscmdutils.c
- doc/examples/decoding_encoding.c 1 addition, 1 deletiondoc/examples/decoding_encoding.c
- doc/examples/muxing.c 1 addition, 1 deletiondoc/examples/muxing.c
- doc/examples/transcoding.c 1 addition, 1 deletiondoc/examples/transcoding.c
- doc/multithreading.txt 1 addition, 1 deletiondoc/multithreading.txt
- ffmpeg.c 4 additions, 4 deletionsffmpeg.c
- ffmpeg_filter.c 2 additions, 2 deletionsffmpeg_filter.c
- ffplay.c 1 addition, 1 deletionffplay.c
- libavcodec/012v.c 1 addition, 1 deletionlibavcodec/012v.c
- libavcodec/4xm.c 1 addition, 1 deletionlibavcodec/4xm.c
- libavcodec/8bps.c 1 addition, 1 deletionlibavcodec/8bps.c
- libavcodec/8svx.c 2 additions, 2 deletionslibavcodec/8svx.c
- libavcodec/a64multienc.c 2 additions, 2 deletionslibavcodec/a64multienc.c
- libavcodec/aacdec.c 2 additions, 2 deletionslibavcodec/aacdec.c
- libavcodec/aacdec_fixed.c 1 addition, 1 deletionlibavcodec/aacdec_fixed.c
- libavcodec/aacenc.c 2 additions, 2 deletionslibavcodec/aacenc.c
- libavcodec/aasc.c 1 addition, 1 deletionlibavcodec/aasc.c
- libavcodec/ac3dec_fixed.c 1 addition, 1 deletionlibavcodec/ac3dec_fixed.c
- libavcodec/ac3dec_float.c 2 additions, 2 deletionslibavcodec/ac3dec_float.c
- libavcodec/adpcm.c 1 addition, 1 deletionlibavcodec/adpcm.c
Loading
Please register or sign in to comment