diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 19:28:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-02 19:28:54 +0200 |
| commit | fa4e17c14035ebf43130fb369e1728cdd98d0b72 (patch) | |
| tree | 76b5cfde975878535eeee8a0aa7c691d2fb7177a /libavcodec/startcode.h | |
| parent | 666e29fe9e7eb9a87eb870f0e6d68331c0615d43 (diff) | |
| parent | b88cc5cca111132b42c2ee99662bfefe7652e3da (diff) | |
| download | ffmpeg-fa4e17c14035ebf43130fb369e1728cdd98d0b72.tar.gz | |
Merge commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da'
* commit 'b88cc5cca111132b42c2ee99662bfefe7652e3da':
bink: Rename BinkDSPContext member so as not to clash with BlockDSPContext
Conflicts:
libavcodec/bink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/startcode.h')
0 files changed, 0 insertions, 0 deletions