]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf6b9c 7c71ada)
Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:45:43 +0000 (09:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 May 2013 07:45:43 +0000 (09:45 +0200)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.