Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:12:29 +0000 (23:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:13:12 +0000 (23:13 +0100)
commitd128794fbc5eb5df9645d7e5fefc66abb3c701b5
treec3beb871cf4e72a4a3d716f70d6290cf609c7f65
parent2e786bc4989835f6d82cc187c4bb37716521a0bf
parenta1e2c47cd4fdaa64beda7e6dfa623b65c46f5012
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'

* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
  libxvid: Return meaningful error messages

Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c

See: 2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libxvid_rc.c