diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:39:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:39:26 +0100 |
| commit | 13fa074173269308f5051bb1a683c9ed54ab8735 (patch) | |
| tree | cd4fa30b5b54e7dbc38b4c9cb7d5708ff5b91824 /libavformat | |
| parent | 2b277f2992d66b7f02fdf8d3642c326087d362a9 (diff) | |
| parent | e951b6d94c441d46b396ef12da1428297d77251d (diff) | |
Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'
* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
vorbisdec: cosmetics: rename variable avccontext to avctx
configure: Identify icc compiler with a less ambiguous pattern
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions