Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:08:27 +0000 (19:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:08:27 +0000 (19:08 +0200)
commit8c6cfffa01b27afde8bb983c6421611e07688aa6
tree9ad90ef8c99c7999a2dd38b51a24ef3d7f5e5e7c
parent7865cafec295b545f6a2b813ca7539086917e513
parentb574e1e97ea7067a5fcd3876e30a67df0e4e6611
Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'

* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
  get_bits: Add OPEN_READER macro variant w/o size_plus8

Conflicts:
libavcodec/get_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvdec.c
libavcodec/get_bits.h