[FFmpeg-cvslog] Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  8 21:53:09 2014 +0200| [fd3388d63d8e379c484d69f4b32a0becbebad78b] | committer: Michael Niedermayer

Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
	libavformat/mov.c

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

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