diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:48:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:48:31 +0200 |
| commit | 83db013a063b67e86c3fc0d77d72a0ac76302974 (patch) | |
| tree | bb4c58f205ecb717a698fb3329b25de742964c00 /libavfilter/af_ashowinfo.c | |
| parent | f5b2718c0ae53459fbd506419884068687278583 (diff) | |
| parent | 0ba4ea312b2a6bebbdd7ff228d46385159c63c9f (diff) | |
| download | ffmpeg-83db013a063b67e86c3fc0d77d72a0ac76302974.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec/options: Drop deprecation warning suppression macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
0 files changed, 0 insertions, 0 deletions