Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)
* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
libavformat/mov.c

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

Simple merge