Merge commit 'eeb6849cedac099d41feb482da581f4059c63ca7'

* commit 'eeb6849cedac099d41feb482da581f4059c63ca7':
  rle: K&R formatting cosmetics

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/rle.c
index 7924ea780f9f96f051af6a108dcc9cfad7266d23,6c8bf27a6688bf15c8ce5422a0178392203b1e84..792bc05e5d02f9f3a920d78a15d2842b01a6df55
--- 1/libavcodec/rle.c
--- 2/libavcodec/rle.c
+++ b/libavcodec/rle.c
@@@ -15,12 -15,14 +15,14 @@@
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
+ 
+ #include "libavutil/common.h"
+ 
  #include "avcodec.h"
  #include "rle.h"
- #include "libavutil/common.h"
  
  int ff_rle_count_pixels(const uint8_t *start, int len, int bpp, int same)
  {

diff --cc libavcodec/rle.h
Simple merge