Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 22:34:00 +0000 (19:34 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 22:34:00 +0000 (19:34 -0300)
commit40fa9d416a2597b1f8a1b9096bfaf05ad367999c
treeff02be2dcaa50d702d7f93359b371b5f3bbacd3f
parent380448194fb490e2bb28f454ca44b034fb8d0c5f
Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"

This reverts commit 1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e, reversing
changes made to 7ebc9f8df4035ecaa84ad4429480986e3e7597ae.

Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.
libavformat/internal.h
libavformat/utils.c