diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:18:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 11:23:49 +0200 |
| commit | a804632b155d7e4841ee568cadb05d4f7e5d4af9 (patch) | |
| tree | 8fe3075db0e1fc1dd0d77ed9a89a90f13e6a021e /libavcodec/mpegaudiodsp.c | |
| parent | e2d4bcd7b8447eaf9628e893eb482f22ae825237 (diff) | |
| parent | 103937681d7e6afd3e8caf8937272575e450fb55 (diff) | |
| download | ffmpeg-a804632b155d7e4841ee568cadb05d4f7e5d4af9.tar.gz | |
Merge commit '103937681d7e6afd3e8caf8937272575e450fb55'
* commit '103937681d7e6afd3e8caf8937272575e450fb55':
tiff: refactor deflate support in a separate function
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodsp.c')
0 files changed, 0 insertions, 0 deletions