decoder/ffmpeg: use AV_SAMPLE_FMT_* if available
Implements support for libavcodec 0.9, which removes the compatibility macros SAMPLE_FMT_*
This commit is contained in:
parent
083340a937
commit
5d9876e338
2
NEWS
2
NEWS
|
@ -2,7 +2,7 @@ ver 0.16.7 (2011/??/??)
|
||||||
* input:
|
* input:
|
||||||
- ffmpeg: support libavformat 0.7
|
- ffmpeg: support libavformat 0.7
|
||||||
* decoder:
|
* decoder:
|
||||||
- ffmpeg: support libavformat 0.8, libavcodec 0.8
|
- ffmpeg: support libavformat 0.8, libavcodec 0.9
|
||||||
- ffmpeg: support all MPD tags
|
- ffmpeg: support all MPD tags
|
||||||
* output:
|
* output:
|
||||||
- httpd: fix excessive buffering
|
- httpd: fix excessive buffering
|
||||||
|
|
|
@ -371,10 +371,18 @@ ffmpeg_sample_format(G_GNUC_UNUSED const AVCodecContext *codec_context)
|
||||||
{
|
{
|
||||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(51, 41, 0)
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(51, 41, 0)
|
||||||
switch (codec_context->sample_fmt) {
|
switch (codec_context->sample_fmt) {
|
||||||
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
|
||||||
|
case AV_SAMPLE_FMT_S16:
|
||||||
|
#else
|
||||||
case SAMPLE_FMT_S16:
|
case SAMPLE_FMT_S16:
|
||||||
|
#endif
|
||||||
return SAMPLE_FORMAT_S16;
|
return SAMPLE_FORMAT_S16;
|
||||||
|
|
||||||
|
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 1)
|
||||||
|
case AV_SAMPLE_FMT_S32:
|
||||||
|
#else
|
||||||
case SAMPLE_FMT_S32:
|
case SAMPLE_FMT_S32:
|
||||||
|
#endif
|
||||||
return SAMPLE_FORMAT_S32;
|
return SAMPLE_FORMAT_S32;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue