aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msvideo1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-15 09:45:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-15 09:45:43 +0200
commit772c801c7db9ef2979356059099661d5159daeea (patch)
tree63ec77f9c046e0535d714c63dc0944a431eb22de /libavcodec/msvideo1.c
parent6bf6b9c279ab4049a8c6408f6c5d4c08afa41681 (diff)
parent7c71ada4cad3c6aab5fa24155c379465c41cfd76 (diff)
downloadffmpeg-772c801c7db9ef2979356059099661d5159daeea.tar.gz
Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'
* commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76': aacenc: Fix a rounding bug in aacpsy channel bitrate computation yadif: correct strides in filter_edges_16bit yadif: restore speed of the C filtering code Conflicts: libavfilter/x86/vf_yadif_init.c No change as these commits where already in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msvideo1.c')
0 files changed, 0 insertions, 0 deletions