aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g726.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-01 21:23:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-01 21:24:01 +0200
commit5dd4e644f3f3608016885d0023d74c832119fd5b (patch)
tree383bcd080c6236ab71405eecc951cda8f051dd28 /libavcodec/g726.c
parentb1071db3dfc6fdfe927bc12b5681e63660102145 (diff)
parentd10d1b86550d254bd1e746ed613bf6885978879c (diff)
downloadffmpeg-5dd4e644f3f3608016885d0023d74c832119fd5b.tar.gz
Merge commit 'd10d1b86550d254bd1e746ed613bf6885978879c'
* commit 'd10d1b86550d254bd1e746ed613bf6885978879c': libx265: enable psnr reporting when requested by the user See: 3956b12fdec5ec1b1358788a6000b78a724f76aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions