[FFmpeg-cvslog] Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  5 22:00:38 2013 +0200| [473d1297427fff8cd00b08ce054e80a262efc6eb] | committer: Michael Niedermayer

Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'

* commit '0404ec619d43f27b87c424aa1a572a6699fe6a31':
  h261: cosmetics: Move functions to avoid forward declarations

Conflicts:
	libavcodec/h261dec.c
	libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=473d1297427fff8cd00b08ce054e80a262efc6eb
---