diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 22:07:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 22:07:24 +0100 |
| commit | a788949255d5fde243575b556e2950feafdc6755 (patch) | |
| tree | 1208497991bf2761a625db4e98f2b65f53e214bc /cmdutils.c | |
| parent | 792845e436ddc5f3ce11ba02535a3372919061f2 (diff) | |
| parent | 6d3ea1957f681b3bf9c752e6d21a501cc8d4180d (diff) | |
| download | ffmpeg-a788949255d5fde243575b556e2950feafdc6755.tar.gz | |
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
Bump major of libavfilter for reference counted buffer API changes.
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions