diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 15:07:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 15:07:45 +0100 |
| commit | ea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4 (patch) | |
| tree | 7d40556d954169ef21968fb56d6e4673d2a8fbfb /tests/ffserver.conf | |
| parent | 9ab8f3738a4cf386538a76e97490237d7a5a249b (diff) | |
| parent | f7e85ee996b3886c2b13e928b83277382311af96 (diff) | |
| download | ffmpeg-ea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4.tar.gz | |
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
lavc: allow the caller to override dimensions in ff_get_buffer()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions