diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:56:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:56:17 +0100 |
| commit | e97a9666ef4511cc34637dc7b064b0a6a4565d0f (patch) | |
| tree | df367f3c79346ee993f3d965fe80a71ea9bad4d1 /libavcodec/libaacplus.c | |
| parent | 815daf1607b0dc5e471a0de1132767f60c8a6fd2 (diff) | |
| parent | 81ef46020fa654720e3beb4f5551ba634fae262a (diff) | |
| download | ffmpeg-e97a9666ef4511cc34637dc7b064b0a6a4565d0f.tar.gz | |
Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
bktr: Use av_strerror and propagate error codes
Conflicts:
libavdevice/bktr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libaacplus.c')
0 files changed, 0 insertions, 0 deletions