[FFmpeg-cvslog] Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 14:16:42 2013 +0200| [b0ba2bf8c66fdae9761b36647b813c830984fb6c] | committer: Michael Niedermayer

Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'

* commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303':
  lavf: move a variable declaration to the block where it's used

Conflicts:
	libavformat/utils.c

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

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