diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:12:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:12:46 +0200 |
| commit | c4dabc38a3a221dde64e1dddb66a7eee6ec4039f (patch) | |
| tree | 98c58fb564b2ba023a03741d7fce40a5a92af0aa /doc/examples/decoding_encoding.c | |
| parent | d60f680fa741cda235a361c85ea246939201576f (diff) | |
| parent | e4fdfdf65d520ce3af13a21ff8a3649e37757af8 (diff) | |
| download | ffmpeg-c4dabc38a3a221dde64e1dddb66a7eee6ec4039f.tar.gz | |
Merge commit 'e4fdfdf65d520ce3af13a21ff8a3649e37757af8' into release/0.10
* commit 'e4fdfdf65d520ce3af13a21ff8a3649e37757af8':
vf_select: Drop a debug av_log with an unchecked double to enum conversion
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions