Revert to CodecID for now

The CodecID symbol was changed to AVCodecID in a recent release.
Reverting back to CodecID until we have a little more time to fix this
for the latest FFMPEG release.

Change-Id: I82a0a7b08cb8f29328e05ac6493316ecb6e05c91
Merge topic 'ffmpeg' into master

ee016b99 Revert to CodecID for now