diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 13:06:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 13:06:25 +0100 |
| commit | d7aaeea5402c81c83960080c5e6086560a962419 (patch) | |
| tree | 407a243c65efa33260c8f4994339f15497fece92 /libavcodec/mpegaudiodsp_data.c | |
| parent | ddb9a24a7f11c448263ef9b163e8425832cb089c (diff) | |
| parent | c220a60f92dde9c7c118fc4deddff5c1f617cda9 (diff) | |
| download | ffmpeg-d7aaeea5402c81c83960080c5e6086560a962419.tar.gz | |
Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'
* commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9':
vdpau: add helper for surface chroma type and size
Conflicts:
libavcodec/vdpau.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodsp_data.c')
0 files changed, 0 insertions, 0 deletions