opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 07:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the new libavcore audio channel API.

Browse Source 
This also allows to remove a linking dependency of libavfilter on
libavcodec.

Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-11-21 20:06:22 +00:00
parent d6e602536c
commit 63e8d9760f
14 changed files with 109 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/utils.c
View File

@ -29,6 +29,7 @@
#include "libavutil/integer.h"
#include "libavutil/crc.h"
#include "libavutil/pixdesc.h"
#include "libavcore/audioconvert.h"
#include "libavcore/imgutils.h"
#include "libavcore/internal.h"
#include "libavcore/samplefmt.h"
@ -922,7 +923,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
", %d Hz", enc->sample_rate);
}
av_strlcat(buf, ", ", buf_size);
avcodec_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout);
av_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout);
if (enc->sample_fmt != AV_SAMPLE_FMT_NONE) {
snprintf(buf + strlen(buf), buf_size - strlen(buf),
", %s", av_get_sample_fmt_name(enc->sample_fmt));