diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:52:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:52:46 +0100 |
| commit | 4b4a7fcb073ecfacfa93a49144acc05c3ece9819 (patch) | |
| tree | 37022f0600b9ff8d6d1b74363bea47ba8ab9d029 /ffmpeg.c | |
| parent | 2865c1b905f05969fed765c97cb6e749a8e83aa9 (diff) | |
| parent | e73996954d8e00117056dcefb38ef3d4d2f37967 (diff) | |
| download | ffmpeg-4b4a7fcb073ecfacfa93a49144acc05c3ece9819.tar.gz | |
Merge commit 'e73996954d8e00117056dcefb38ef3d4d2f37967'
* commit 'e73996954d8e00117056dcefb38ef3d4d2f37967':
filtfmts-test: Fix use of deprecated API
Conflicts:
libavfilter/filtfmts.c
See: f12174c8cef872030a156cbf252f4951c3a6357c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions