diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:36:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:36:32 +0100 |
| commit | 6732f4350d0869daac2ac94c110e6d3b08d6f87f (patch) | |
| tree | d07cc8338f9ca916354078afd58a20c976146c00 /libavresample | |
| parent | ee2c1e6dd337aeda24bcd95b55e4fb6e0b4f3638 (diff) | |
| parent | 38893dc028e458eaf3f906833d4ee515689edb7e (diff) | |
| download | ffmpeg-6732f4350d0869daac2ac94c110e6d3b08d6f87f.tar.gz | |
Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e'
* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
pcmdec: replace a reachable assert with an error check
Conflicts:
libavformat/pcmdec.c
No assert removed as there was none in FFmpeg in the equivalent function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions