[FFmpeg-cvslog] Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 12:33:33 2014 +0100| [9517900bef528527d8507da5a1992f99513d71b4] | committer: Michael Niedermayer

Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_mvpred.h
	libavcodec/svq1enc.c

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

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