Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76'

Browse Source

* 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>

...

This commit is contained in:

Michael Niedermayer 2013-05-15 09:45:43 +02:00

parent 6bf6b9c279 7c71ada4ca

commit 772c801c7d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available