Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 11:17:20 +0000 (13:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 11:44:44 +0000 (13:44 +0200)
commit8ba683e629bd44f5c222ff8fe9cfdc101177dc0f
tree41d00f799cc67751e1c7ccaf03e3b4f5938a2212
parent92b7e7b31817cd470c38f84bac2053cd565ae521
parent8aba7968dd604aae91ee42cbce0be3dad7dceb30
Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30'

* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
  vcr1: add sanity checks

Conflicts:
libavcodec/vcr1.c

See: 845724c82c1a732ab398c9e8cedd178f96f1626d
See: 8e09482e4d27d65bbce2ce5c2f4392216011ed09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vcr1.c