diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 21:01:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 21:03:06 +0100 |
| commit | a28313b09e73d8e908223027909e9b836a3c0fa5 (patch) | |
| tree | 0901d636b7084f1bdf43493e5c65c28227837883 /libavdevice/decklink_enc.h | |
| parent | 66b9e60af0b82ee8bd63d84011127dca4ea1e23f (diff) | |
| parent | 351d0f8b7a6ecce411ae75fb3511573c34317218 (diff) | |
| download | ffmpeg-a28313b09e73d8e908223027909e9b836a3c0fa5.tar.gz | |
Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'
* commit '351d0f8b7a6ecce411ae75fb3511573c34317218':
get_bits: remove unused assignment
Conflicts:
libavcodec/get_bits.h
See: ea6178fff8ee0ccf145a2cbd5ab3c1bf73cd03d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/decklink_enc.h')
0 files changed, 0 insertions, 0 deletions