Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 08:58:52 +0000 (10:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 08:59:04 +0000 (10:59 +0200)
commitc1343897c3c879d8842f06220dd1019fd4f8baf7
tree4be8c6bf0d42920de995d721eeb01886cbc17b5c
parent53fd1ab26bec7d045d168590bf49de722e2a601c
parentafe03092dd693d025d43e1620283d8d285c92772
Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'

* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

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