[FFmpeg-cvslog] Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 18:33:33 2013 +0200| [74e1aa17df990ff18fd03818b07aff7084d51ae9] | committer: Michael Niedermayer

Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

* commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a':
  mxfenc: Use correct printf format specifier for int64_t
  h264: Drop unused variable

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

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