[FFmpeg-cvslog] Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 26 02:17:05 2014 +0200| [0a9bab5be64ffb85b2597bfd6e506a7fce512c0b] | committer: Michael Niedermayer

Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'

* commit 'ff85334375c6733c6116ea3686f128b4a11f33e7':
  mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines

CHROMA_444 is not removed as we do support CHROMA_444 and use the
identifier

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

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