diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-29 00:07:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-29 00:07:34 +0400 |
| commit | ca7fa3a5167dc480917491bca4a1bc873d24125a (patch) | |
| tree | 71f6233924888e00e867321c136e780ddc66e075 /ffmpeg.c | |
| parent | f2bc2e89548706beee056f40036fc571ea817b80 (diff) | |
| parent | 0426c6931070a65a7ec8362d12038ef10fa015ee (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
AVOptions: fix the value printed in out of range error message.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions