[FFmpeg-cvslog] Merge commit 'bf9856250584228678963ce8f11c54f85005d783'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 12:44:29 2013 +0200| [f5a0c205d91d049a663f704dda606a5562055efb] | committer: Michael Niedermayer

Merge commit 'bf9856250584228678963ce8f11c54f85005d783'

* commit 'bf9856250584228678963ce8f11c54f85005d783':
  mov: Refactor codec id selection in mov_codec_id

Conflicts:
	libavformat/mov.c

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

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