diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:29:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:29:48 +0100 |
| commit | 61d0a6dd9554ecd705518d38d531363cdabab7d3 (patch) | |
| tree | 9119cf539e023a3510d8dbcb72c17d8122b46278 /libswscale/log2_tab.c | |
| parent | 9adc999d2a927123d4b37a2a0c6eeb0d37c12cef (diff) | |
| parent | 7464e98f74c03d3efa0cdc8d7abad06e4c3c277a (diff) | |
| download | ffmpeg-61d0a6dd9554ecd705518d38d531363cdabab7d3.tar.gz | |
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
aac: Simplify decode_mid_side_stereo
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/log2_tab.c')
0 files changed, 0 insertions, 0 deletions