diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-02 23:03:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-03 09:48:33 +0000 |
| commit | e1a7890c6cee31ebbd55e5209cd14bb3b9b93bf0 (patch) | |
| tree | f814561091cae2b745de77a813edb5c5b4252e62 /ChangeLog | |
| parent | f1a34d5f3ff52ea56f8b14aa34750f407a9c6855 (diff) | |
Forward-port avcodec_decode_audio4 error handling patch from v1.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,4 @@ +<<<<<<< HEAD 2014-10-30 Carl Hetherington <cth@carlh.net> * Version 2.0.19 released. @@ -14,6 +15,12 @@ 2014-10-26 Carl Hetherington <cth@carlh.net> * Version 2.0.17 released. +======= +2014-11-02 Carl Hetherington <cth@carlh.net> + + * Be more tolerant of some FFmpeg audio decoding errors; + should fix #352. +>>>>>>> fc8fb8f... Process decoded audio even if avcodec_decode_audio4 returns an error, as there are cases where it produces good data and then returns an error. 2014-10-26 Carl Hetherington <cth@carlh.net> |