[FFmpeg-devel] [PATCH] aac: Rework extradata parsing code

Michael Niedermayer michael at niedermayer.cc
Wed Apr 18 23:39:24 EEST 2018


On Tue, Apr 17, 2018 at 11:47:00AM -0400, Vittorio Giovara wrote:
> - enable the parsing code
> - use the new buffer instead of replacing the context one
> - do not push/pop configuration, just discard the exiting one
> - propagate errors correctly
> ---
> 
> ping
> 
> 
>  libavcodec/aacdec_template.c | 22 ++++++++--------------
>  1 file changed, 8 insertions(+), 14 deletions(-)
> 
> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
> index cf97181092..0c899285dd 100644
> --- a/libavcodec/aacdec_template.c
> +++ b/libavcodec/aacdec_template.c
> @@ -3324,20 +3324,14 @@ static int aac_decode_frame(AVCodecContext
> *avctx, void *data,
>                                         AV_PKT_DATA_JP_DUALMONO,
>                                         &jp_dualmono_size);

This patch is corrupted by newlines

Applying: aac: Rework extradata parsing code
error: corrupt patch at line 14
error: could not build fake ancestor


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Let us carefully observe those good qualities wherein our enemies excel us
and endeavor to excel them, by avoiding what is faulty, and imitating what
is excellent in them. -- Plutarch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180418/74c41438/attachment.sig>


More information about the ffmpeg-devel mailing list