On 2011-12-31 14:51:40 -0500, Justin Ruggles wrote:
> This does not change any current behavior, but it does more clearly define it.
> ---
> avconv.c | 2 +-
> libavcodec/avcodec.h | 14 ++++++++++----
> libavcodec/g722enc.c | 1 +
> libavcodec/pcm.c | 1 +
> 4 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/avconv.c b/avconv.c
> index f3e6e28..2a45c8e 100644
> --- a/avconv.c
> +++ b/avconv.c
> @@ -1060,7 +1060,7 @@ need_realloc:
> }
>
> /* now encode as many frames as possible */
> - if (enc->frame_size > 1) {
> + if (!(enc->codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) {
> /* output resampled raw samples */
> if (av_fifo_realloc2(ost->fifo, av_fifo_size(ost->fifo) + size_out)
> < 0) {
> av_log(NULL, AV_LOG_FATAL, "av_fifo_realloc2() failed\n");
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 4e80de8..5946ad3 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -777,6 +777,10 @@ typedef struct RcOverride{
> * Codec supports changed parameters at any point.
> */
> #define CODEC_CAP_PARAM_CHANGE 0x4000
> +/**
> + * Audio encoder supports receiving a different number of samples in each
> call.
> + */
> +#define CODEC_CAP_VARIABLE_FRAME_SIZE 0x4000
conflict and not rebased on git origin/master, otherwise ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
