vf_transpose: K&R formatting cosmetics
avconv: More descriptive message about framedrop
avcodec: add missing includes
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'

* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
  vf_transpose: K&R formatting cosmetics

Conflicts:
	libavfilter/vf_transpose.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: add missing includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h261dec: fix motion vector vissualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>