diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:01:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:01:31 +0200 |
commit | 4f4f78ea48d84f32f5ed9447a2f9174020196e89 (patch) | |
tree | 5abcbed7eda0f1b398647017bcfd14c1522f6ec6 /libavfilter/buffer.c | |
parent | e1ce4f805f31aecec83fc7c7ecaab623f3b6327f (diff) | |
parent | 9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a (diff) | |
download | ffmpeg-4f4f78ea48d84f32f5ed9447a2f9174020196e89.tar.gz |
Merge commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a' into release/2.4
* commit '9eb442cca23bb8d33b3e6d37b8c0e3afff04c37a':
Update default FATE URL for release/11
Conflicts:
tests/Makefile
no change, as we do not have per release reference samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffer.c')
0 files changed, 0 insertions, 0 deletions