virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()

Browse Source 
Use default alignment in audio_get_buffer()
This commit is contained in:
Justin Ruggles 2012-04-05 19:01:21 -04:00
parent 0109a09dc3
commit c58846f3a8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -3828,7 +3828,7 @@ int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
* @param sample_fmt sample format * @param sample_fmt sample format
* @param buf buffer to use for frame data * @param buf buffer to use for frame data
* @param buf_size size of buffer * @param buf_size size of buffer
* @param align plane size sample alignment * @param align plane size sample alignment (0 = default)
* @return 0 on success, negative error code on failure * @return 0 on success, negative error code on failure
*/ */
int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,

4
libavcodec/utils.c
View File

@ -292,7 +292,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
buf_size = av_samples_get_buffer_size(NULL, avctx->channels, buf_size = av_samples_get_buffer_size(NULL, avctx->channels,
frame->nb_samples, avctx->sample_fmt, frame->nb_samples, avctx->sample_fmt,
32); 0);
if (buf_size < 0) if (buf_size < 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -334,7 +334,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
} }
if ((ret = avcodec_fill_audio_frame(frame, avctx->channels, if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
avctx->sample_fmt, buf->data[0], avctx->sample_fmt, buf->data[0],
buf->audio_data_size, 32))) buf->audio_data_size, 0)))
return ret; return ret;
if (frame->extended_data == frame->data) if (frame->extended_data == frame->data)

2
libavcodec/version.h
View File

@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 11 #define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \