lavc: fix previous merge
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 22:42:16 +0000 (00:42 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 22:42:16 +0000 (00:42 +0200)
commitaef2d3d2b5f9eb33cdf1a4f7b8a2fd83f393d665
treef970857511c4be3a59bca9eb0d7adfb4dda82297
parentbcafc41a5aa838ff4a88cc020bd55aa6e0790723
lavc: fix previous merge
libavcodec/rl.c
libavcodec/vlc.h