diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 12:52:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 13:01:11 +0100 |
commit | 9e22b8aca0fdecee332191fabded428e6a183d25 (patch) | |
tree | be8d6f2874d2045e449796d046642d9a1d00c730 /libavresample/options.c | |
parent | 8617be28d074c4708d2c948cbc311737cf2fbf39 (diff) | |
parent | 0ba8ba165b84a971dbe9356b57f272dc81410eaf (diff) | |
download | ffmpeg-9e22b8aca0fdecee332191fabded428e6a183d25.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacps: Adjust some const qualifiers to suppress warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/options.c')
0 files changed, 0 insertions, 0 deletions