diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 20:38:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 20:38:35 +0100 |
| commit | e5b7e2224f62e9cb6697e664b7d1245302cca9e7 (patch) | |
| tree | f652fd5d7685621c7111e3be787b84d9c99bb858 /libavdevice/pulse_audio_dec.c | |
| parent | bcadf5d940e72fbd5f9c6a72dfdef7edcf551a33 (diff) | |
| parent | 41e03e284ee7b0d4caa3a5d28681ad46e3105d65 (diff) | |
| download | ffmpeg-e5b7e2224f62e9cb6697e664b7d1245302cca9e7.tar.gz | |
Merge commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65'
* commit '41e03e284ee7b0d4caa3a5d28681ad46e3105d65':
DNxHD: More verbose error messages
Conflicts:
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_dec.c')
0 files changed, 0 insertions, 0 deletions