Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'

* commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1':
  movenc: use the "encoder" metadata tag to write stsd Compressorname

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

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

1 files changed, 1 insertions, 1 deletions

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index fce2d3c932..be0a851d12 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -98,7 +98,7 @@ typedef struct MOVTrack {
     int         language;
     int         track_id;
     int         tag; ///< stsd fourcc
-    AVStream    *st;
+    AVStream        *st;
     AVCodecContext *enc;
 
     int         vos_len;