Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:06:55 +0000 (11:06 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:06:55 +0000 (11:06 +0200)
commit182550e42c02b16ecb7fd2a77ea532c830c8ce78
tree5159b0909fa5cd7b5413cd16835bffaf8896ba6b
parentcbbd906be6150be38dfc14b6bc67dcac8da8aea4
parent10de408738d28ab17aa5c1fdccd809b0637c12d5
Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5'

* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfcrypt.c
libavformat/omadec.c