diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:53:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 11:53:57 +0100 |
| commit | feccf2f6b747e433766464e8a8b215cbe70c5f27 (patch) | |
| tree | fa169b3b674e6b9606b72141cf02f3997ca60c74 /libavutil/fifo.c | |
| parent | b3b46cd74e9facb40d18c40de23b0f0ada1a48d4 (diff) | |
| parent | 3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00 (diff) | |
| download | ffmpeg-feccf2f6b747e433766464e8a8b215cbe70c5f27.tar.gz | |
Merge commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00'
* commit '3bcdf8dcb9891ffe49b6398d0e2c02f1712d8f00':
lavc: remove disabled FF_API_SNOW cruft
Conflicts:
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/fifo.c')
0 files changed, 0 insertions, 0 deletions