Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Sep 2012 12:09:32 +0000 (14:09 +0200)
* qatar/master:
  crypto: Remove a stray double space
  Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

Conflicts:
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavfilter/vsrc_testsrc.c

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

index 7095360..93c9f23 100644 (file)
@@ -48,7 +48,7 @@ typedef struct {
 #define D AV_OPT_FLAG_DECODING_PARAM
 static const AVOption options[] = {
     {"key", "AES decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, .flags = D },
-    {"iv",  "AES decryption initialization vector", OFFSET(iv),  AV_OPT_TYPE_BINARY, .flags = D },
+    {"iv",  "AES decryption initialization vector", OFFSET(iv), AV_OPT_TYPE_BINARY, .flags = D },
     { NULL }
 };