[FFmpeg-cvslog] Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  6 12:34:09 2013 +0200| [61845dc74afce9c33583eb1d0ed82c115ff61d4b] | committer: Michael Niedermayer

Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'

* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
  mpeg12enc: drop forward declarations

Conflicts:
	libavcodec/mpeg12enc.c

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

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