diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:44:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 13:44:34 +0200 |
| commit | b0edd599940491d04a49b6b4e85189460313ebd9 (patch) | |
| tree | b764f105a2f5d1fab051441e8b0bf2704d169f2b /common.mak | |
| parent | 8ff23f0e3c9a6665c34c45b5635c2c149d30b264 (diff) | |
| parent | bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2 (diff) | |
| download | ffmpeg-streaming-b0edd599940491d04a49b6b4e85189460313ebd9.zip ffmpeg-streaming-b0edd599940491d04a49b6b4e85189460313ebd9.tar.gz | |
Merge commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2'
* commit 'bf4b0ed1d5d323050a87c9f0ad1dd40860eb3da2':
Add missing deprecation attributes
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions
