Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:28:23 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:35:52 +0000 (11:35 +0200)
commiteec9c7af3370ee1a114597686382a4ca029392ca
tree7ff32820367148a5b85af24f119608753233f80d
parent579a137897993e474af08499bd4c2ae62f4e9880
parentfee9db1fdf921295233e94cbe2769f9cd722206d
Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'

* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
  libavcodec: use avpriv_open()

Conflicts:
libavcodec/libxvid_rc.c

The changed code does not exist in ffmpeg anymore, thus nothing is
changed.

Merged-by: Michael Niedermayer <michaelni@gmx.at>