diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:32:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:32:31 +0200 |
| commit | 783c674da7da4335b75c23809774161e4ac4398d (patch) | |
| tree | 47ed28d389e2beb158357ddacc450dea94b8b31c /libavcodec/aacdec.c | |
| parent | 46b3dbf9ca1b65d909a27e01c7b6742d41688ce2 (diff) | |
| parent | 51fc88e7467169031b20b9983d80456b893a9fa3 (diff) | |
Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'
* commit '51fc88e7467169031b20b9983d80456b893a9fa3':
avconv: improve some variable names
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
0 files changed, 0 insertions, 0 deletions