Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 16:33:33 +0000 (18:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 16:33:37 +0000 (18:33 +0200)
commit74e1aa17df990ff18fd03818b07aff7084d51ae9
treedcb2bb5eb57ad4b3e9c75a3c464fb5e897c12455
parentf84e373797eb8ef7028b93f5ac9b0b7e1c5e0e78
parenta0d5ca4f0a8e2c34d784d503a12af6303424ac6a
Merge commit 'a0d5ca4f0a8e2c34d784d503a12af6303424ac6a'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfenc.c