diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:38:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:38:18 +0200 |
| commit | f973f1741649df5ba11c11721aa088c883d467f5 (patch) | |
| tree | 924370345c5aa0a3a5a3eea2c12ee7ae5d73867e /doc | |
| parent | a5a9bcc8760afafb8d8398a2cf6ffe6a1091dbbe (diff) | |
| parent | a3b2b83f01a426376c539256b790beb7b9cec876 (diff) | |
| download | ffmpeg-f973f1741649df5ba11c11721aa088c883d467f5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
faxcompr: return meaningful errors
Conflicts:
libavcodec/faxcompr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions