Signed-off-by: Rafaël Carré <funman@videolan.org>
Modified-by: Rafaël Carré <funman@videolan.org>
    ... Replace them in ASF demux as well
(cherry picked from commit a67afb66)
Signed-off-by: KO Myung-Hun <komh@chollian.net>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>