diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:13:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:13:54 +0200 |
| commit | f3ae90621e03e2d91201e4f863c6d5b61555cadd (patch) | |
| tree | e5df48a24b401b0fde5d1f0cd51e1d7cf932a8dc /doc/examples/decoding_encoding.c | |
| parent | c4dabc38a3a221dde64e1dddb66a7eee6ec4039f (diff) | |
| parent | 277103e07fbe22fc8e4361bacd5c6b48133f3ba5 (diff) | |
| download | ffmpeg-f3ae90621e03e2d91201e4f863c6d5b61555cadd.tar.gz | |
Merge commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5' into release/0.10
* commit '277103e07fbe22fc8e4361bacd5c6b48133f3ba5':
video4linux2: Avoid a floating point exception
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions