-
Rémi Denis-Courmont authored
(cherry picked from commit 3d29910e66214abb38d72a5d8172c4402144eb0d) Conflicts: modules/codec/avcodec/video.c
bb466df9
(cherry picked from commit 3d29910e66214abb38d72a5d8172c4402144eb0d) Conflicts: modules/codec/avcodec/video.c