Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 19:25:31 +0000 (21:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Apr 2013 19:25:49 +0000 (21:25 +0200)
* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1':
  h261: Remove H.261 loop filter from dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h261.c

Simple merge
Simple merge
Simple merge