diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:08:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:08:27 +0200 |
| commit | 8c6cfffa01b27afde8bb983c6421611e07688aa6 (patch) | |
| tree | 9ad90ef8c99c7999a2dd38b51a24ef3d7f5e5e7c /libavfilter | |
| parent | 7865cafec295b545f6a2b813ca7539086917e513 (diff) | |
| parent | b574e1e97ea7067a5fcd3876e30a67df0e4e6611 (diff) | |
| download | ffmpeg-8c6cfffa01b27afde8bb983c6421611e07688aa6.tar.gz | |
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>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions