On Sat, Oct 10, 2015 at 11:05:50PM -0500, Rodger Combs wrote: > hex_to_data should probably move to lavu before this is merged. > > This is probably a good case for sub_charenc to run _after_ the decoder. > > I could see an argument that this should go in the demuxer instead. Thoughts? > --- > libavcodec/samidec.c | 78 > ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) [...]
> @@ -158,6 +207,18 @@ static av_cold int sami_init(AVCodecContext *avctx)
> av_bprint_init(&sami->encoded_source, 0, 2048);
> av_bprint_init(&sami->encoded_content, 0, 2048);
> av_bprint_init(&sami->full, 0, 2048);
> +
> + if (sami->key && sami->iv && *sami->iv && !sami->iv_size)
> + sami->iv_size = strlen(sami->iv);
> +
> + if (sami->key_size && sami->iv_size) {
> + sami->aes = av_aes_alloc();
> + if (!sami->aes)
> + return ENOMEM;
AVERROR(ENOMEM)
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Democracy is the form of government in which you can choose your dictator
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
