diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 20:34:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 20:34:42 +0200 |
| commit | a5f409bcc09176ad9443697d95da6a1edf3944aa (patch) | |
| tree | 3fe98dafa3933f380be99cb5ef5428b456acd9f3 /libavcodec/sipr.h | |
| parent | a50b00822784f6b098eb634132ad75394f1d26c0 (diff) | |
| parent | 9a5e4fbec870c7d466b7a0aec92c70778efc96b5 (diff) | |
| download | ffmpeg-a5f409bcc09176ad9443697d95da6a1edf3944aa.tar.gz | |
Merge commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5'
* commit '9a5e4fbec870c7d466b7a0aec92c70778efc96b5':
avconv: do not stop processing the input packet on decoding error
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr.h')
0 files changed, 0 insertions, 0 deletions