diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 12:32:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 12:38:26 +0200 |
| commit | 10b6d7462cbf0d13913c9d07e85c79210427d71e (patch) | |
| tree | ff6dffb91bb5c46b7aefcc5296523dacf67c1abb /libavcodec/gsm_parser.c | |
| parent | b64b719ad5c212e197009fa3f1e7aa96255cbd28 (diff) | |
| parent | ce083282f0a8b7d63c4047c30b7bac498f9806dd (diff) | |
| download | ffmpeg-10b6d7462cbf0d13913c9d07e85c79210427d71e.tar.gz | |
Merge commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd'
* commit 'ce083282f0a8b7d63c4047c30b7bac498f9806dd':
vdpau: common support for managing the VdpDecoder in avcodec
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm_parser.c')
0 files changed, 0 insertions, 0 deletions