diff options
| author | Michael Niedermayer <[email protected]> | 2013-10-16 12:02:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-10-16 12:07:02 +0200 |
| commit | 6659eb71167461e3cc6e87df028b97bab8fcf8a5 (patch) | |
| tree | 2c89e81cfe0347672ffa8ee595a9a6e2e48f09fd /libavcodec/h264_parser.c | |
| parent | 8895b71d6fc107c51b1bbc32323da5b2a617e842 (diff) | |
| parent | dd33637c18629c3e554ebb146bbeb45c9745a5cf (diff) | |
Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'
* commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf':
tiny_psnr: switch f32 handling to floating point
Conflicts:
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/h264_parser.c')
0 files changed, 0 insertions, 0 deletions