Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:39:44 +0000 (00:39 +0100)
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

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

Simple merge