diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:21:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:22:35 +0100 |
| commit | 65da7007043cf4fb99b72c7f823cfc15e429b45f (patch) | |
| tree | baf5a652e66f919f462cc80c6d8fe0d247788475 /libavdevice/dshow.c | |
| parent | afe30fe0600824b0dcda8318f09a5a4e376b99c3 (diff) | |
| parent | 1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8 (diff) | |
| download | ffmpeg-65da7007043cf4fb99b72c7f823cfc15e429b45f.tar.gz | |
Merge commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8'
* commit '1b9b6d6e5ea556b6d307f9d473f54f6406fdc3c8':
qcelp: decode directly to the user-provided AVFrame
pcm-bluray: decode directly to the user-provided AVFrame
nellymoser: decode directly to the user-provided AVFrame
mpc7/8: decode directly to the user-provided AVFrame
mpegaudio: decode directly to the user-provided AVFrame
mlp/truehd: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/mpc7.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow.c')
0 files changed, 0 insertions, 0 deletions