summaryrefslogtreecommitdiffstats
path: root/libavcodec/libgsmdec.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec: add metadata to identify wrappers and hardware decoderswm42017-12-141-0/+2
| | | | | | | | | | | | | | | | | | | | | Explicitly identify decoder/encoder wrappers with a common name. This saves API users from guessing by the name suffix. For example, they don't have to guess that "h264_qsv" is the h264 QSV implementation, and instead they can just check the AVCodec .codec and .wrapper_name fields. Explicitly mark AVCodec entries that are hardware decoders or most likely hardware decoders with new AV_CODEC_CAPs. The purpose is allowing API users listing hardware decoders in a more generic way. The proposed AVCodecHWConfig does not provide this information fully, because it's concerned with decoder configuration, not information about the fact whether the hardware is used or not. AV_CODEC_CAP_HYBRID exists specifically for QSV, which can have software implementations in case the hardware is not capable. Based on a patch by Philip Langdale <philipl@overt.org>. Merges Libav commit 47687a2f8aca3f65b6fdd117b1cb66a7409a7fd1.
* Revert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"James Almer2017-11-111-0/+5
| | | | | | | This reverts commit 1a4315f24d2c5857ebeb379fe39f0124746ee30a, reversing changes made to 869401cefc22e221edbf135bacaa1f21014fd001. At least one distro (Arch) ships gsm.h inside the gsm/ folder
* Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'James Almer2017-11-111-5/+0
|\ | | | | | | | | | | | | | | | | * commit '8e97a8c69162afce47abea96c8c0914f3550e212': build: Remove check for gsm/gsm.h for libgsm Also includes fix from 010baac12a14d684a1ae72f6b7509e642c40f3b3 Merged-by: James Almer <jamrial@gmail.com>
| * build: Remove check for gsm/gsm.h for libgsmDiego Biurrun2017-10-101-5/+0
| | | | | | | | | | | | libgsm never installed more than a single header, the headers installed into the gsm/ subdirectory by some distros are private. Who started this nonsense is a mystery, but it got cargo-culted around ever since.
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': 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>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-2/+2
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5'Michael Niedermayer2014-07-181-9/+11
|/ | | | | | | | | | * commit 'b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5': libgsm: Split decoder and encoder Conflicts: libavcodec/libgsmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* libgsm: Split decoder and encoderNidhi Makhijani2014-07-181-0/+151
Signed-off-by: Diego Biurrun <diego@biurrun.de>
OpenPOWER on IntegriCloud