diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:43:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 15:43:55 +0100 |
| commit | c738ffcf2c0717ed3546ea7e0d06cc4df2026024 (patch) | |
| tree | e4074b6c4df0bc579ef52be714524c21e9c5ce4c /libavcodec/resample.c | |
| parent | 3731c409890c2edd76ededfbc6038d940d2b0afb (diff) | |
| parent | 58c215961a9067bb670387bbd72286c30de04b93 (diff) | |
| download | ffmpeg-c738ffcf2c0717ed3546ea7e0d06cc4df2026024.tar.gz | |
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
* commit '58c215961a9067bb670387bbd72286c30de04b93':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See: edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions