diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:05:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:05:46 +0200 |
| commit | c01bcce4959a208a4f6b66fd527760ed45cd29bb (patch) | |
| tree | 5c7c0bb45c5d3fc6ea0e1da7858da6e95802db77 /libswscale/version.h | |
| parent | a6ba5184a5e2a224f4f62bbb736b68dc416120fe (diff) | |
| parent | d246231e4714119faac6c7acd881d3b687bb8b11 (diff) | |
| download | ffmpeg-c01bcce4959a208a4f6b66fd527760ed45cd29bb.tar.gz | |
Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'
* commit 'd246231e4714119faac6c7acd881d3b687bb8b11':
wavenc: use codec descriptors to get the codec name
Conflicts:
libavformat/wavenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/version.h')
0 files changed, 0 insertions, 0 deletions