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)
* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

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

diff --cc libavcodec/dv.c
Simple merge
Simple merge