diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 01:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 01:51:11 +0200 |
| commit | 54d628a580bea7bfcd84461ef6d953c3e09d908a (patch) | |
| tree | c36c29f14b6983d638d72fa7c30bac85aa1664f3 /libavcodec/wma.h | |
| parent | e5c338ba7abd086b54021da885dc3b451927f4d5 (diff) | |
| parent | 6fcfafff8456942172a4b610454175a5d289270b (diff) | |
| download | ffmpeg-54d628a580bea7bfcd84461ef6d953c3e09d908a.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Show subtitle resolution in avcodec_string().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.h')
0 files changed, 0 insertions, 0 deletions